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-5.0-16~6
X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=4f51780e7173b549601c41d96b0a1c7c4255f929

workaround for f14 bootCD
---

diff --git a/source/steps/MakeInitrd.py b/source/steps/MakeInitrd.py
index b70271d..808dac1 100644
--- a/source/steps/MakeInitrd.py
+++ b/source/steps/MakeInitrd.py
@@ -52,8 +52,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)