From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 6 Jan 2011 12:09:17 +0000 (+0100)
Subject: fix for f14
X-Git-Tag: bootmanager-4.3-23~6
X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=3062136ba008ecd9e9bf326803063e26ace3ad4b

fix for f14
---

diff --git a/source/steps/MakeInitrd.py b/source/steps/MakeInitrd.py
index 42ccf87..66ba5e6 100644
--- a/source/steps/MakeInitrd.py
+++ b/source/steps/MakeInitrd.py
@@ -6,12 +6,11 @@
 # Copyright (c) 2004-2006 The Trustees of Princeton University
 # All rights reserved.
 
-import os, string
+import os, os.path
 
 from Exceptions import *
 import utils
 import systeminfo
-import shutil
 
 def kernelHasMkinitrd():
     #  Older bootcds only support LinuxThreads.  This hack is to get mkinitrd
@@ -63,7 +62,9 @@ def Run( vars, log ):
 
     # mkinitrd needs /dev and /proc to do the right thing.
     # /proc is already mounted, so bind-mount /dev here
-    utils.sysexec("mount -o bind /dev %s/dev" % SYSIMG_PATH)
+    # 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)
     utils.sysexec("mount -t sysfs none %s/sys" % SYSIMG_PATH)
 
     initrd, kernel_version= systeminfo.getKernelVersion(vars,log)