X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FMakeInitrd.py;fp=source%2Fsteps%2FMakeInitrd.py;h=e40f9fd0a686af06f7166b3adeb01f4b88b0ffa5;hb=a2a9b82d4966aecc2d1aeafc2affdb5bc9726ec6;hp=1f08fbaff73c1da1b861d2f93f21a2e011c9eaef;hpb=054bb652f3b74e53fa8859ecea165ea8b1dd74f1;p=bootmanager.git

diff --git a/source/steps/MakeInitrd.py b/source/steps/MakeInitrd.py
index 1f08fba..e40f9fd 100644
--- a/source/steps/MakeInitrd.py
+++ b/source/steps/MakeInitrd.py
@@ -62,8 +62,11 @@ 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
-    utils.sysexec_noerr("mount -o bind /dev %s/dev" % SYSIMG_PATH)
+    # xxx tmp - trying to work around the f14 case:
+    # check that /dev/ is mounted with devtmpfs
+    if utils.sysexec_noerr ("grep devtmpfs /proc/mounts") != 0:
+        utils.sysexec("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)