From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 17 Jan 2011 15:34:55 +0000 (+0100)
Subject: workaround for f14 bootCD
X-Git-Tag: bootmanager-4.3-23~4
X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=a2a9b82d4966aecc2d1aeafc2affdb5bc9726ec6

workaround for f14 bootCD
---

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)