X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FMakeInitrd.py;h=e40f9fd0a686af06f7166b3adeb01f4b88b0ffa5;hb=a2a9b82d4966aecc2d1aeafc2affdb5bc9726ec6;hp=66ba5e642a8602b0ba2c5d0fb20e74b18b2376d2;hpb=3062136ba008ecd9e9bf326803063e26ace3ad4b;p=bootmanager.git

diff --git a/source/steps/MakeInitrd.py b/source/steps/MakeInitrd.py
index 66ba5e6..e40f9fd 100644
--- 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,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
-    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
+    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)