this sysexec thing just sucks

[bootmanager.git] / source / steps / MakeInitrd.py

diff --git a/source/steps/MakeInitrd.py b/source/steps/MakeInitrd.py
index 66ba5e6..fc587c4 100644 (file)
--- a/source/steps/MakeInitrd.py
+++ b/source/steps/MakeInitrd.py
@@ -6,7 +6,7 @@
 # Copyright (c) 2004-2006 The Trustees of Princeton University
 # All rights reserved.
 
-import os, os.path
+import os
 
 from Exceptions import *
 import utils
@@ -62,9 +62,12 @@ def Run( vars, log ):
 
     # mkinitrd needs /dev and /proc to do the right thing.
     # /proc is already mounted, so bind-mount /dev here
-    # looks like this dir somehow already exists under f14
-    if not os.path.isdir ("%s/dev" % SYSIMG_PATH):
-        utils.sysexec("mount -o bind /dev %s/dev" % SYSIMG_PATH)
+    # xxx tmp - trying to work around the f14 case:
+    # check that /dev/ is mounted with devtmpfs
+    # tmp - sysexec_noerr not returning what one would expect
+    # if utils.sysexec_noerr ("grep devtmpfs /proc/mounts") != 0:
+    utils.sysexec_noerr("mount -t devtmpfs none /dev")
+    utils.sysexec("mount -o bind /dev %s/dev" % SYSIMG_PATH)
     utils.sysexec("mount -t sysfs none %s/sys" % SYSIMG_PATH)
 
     initrd, kernel_version= systeminfo.getKernelVersion(vars,log)