fix for f14

[bootmanager.git] / source / steps / MakeInitrd.py

diff --git a/source/steps/MakeInitrd.py b/source/steps/MakeInitrd.py
index 7fa7178..66ba5e6 100644 (file)
--- 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,20 +62,26 @@ 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)
-    utils.removefile( "%s/boot/%s" % (SYSIMG_PATH, initrd) )
+    try:
+        utils.removefile( "%s/boot/%s" % (SYSIMG_PATH, initrd) )
+    except:
+        print "%s/boot/%s is already removed" % (SYSIMG_PATH, initrd)
+
     # hack for CentOS 5.3
     bypassRaidIfNeeded(SYSIMG_PATH)
     if kernelHasMkinitrd() == True:
-        utils.sysexec( "chroot %s mkinitrd -v /boot/initrd-%s.img %s" % \
-                   (SYSIMG_PATH, kernel_version, kernel_version), log )
+        utils.sysexec_chroot( SYSIMG_PATH, "mkinitrd -v --allow-missing /boot/initrd-%s.img %s" % \
+                   (kernel_version, kernel_version), log )
     else:
         shutil.copy("./mkinitrd.sh","%s/tmp/mkinitrd.sh" % SYSIMG_PATH)
         os.chmod("%s/tmp/mkinitrd.sh" % SYSIMG_PATH, 755)
-        utils.sysexec( "chroot %s /tmp/mkinitrd.sh %s" % (SYSIMG_PATH, kernel_version))
+        utils.sysexec_chroot( SYSIMG_PATH, "/tmp/mkinitrd.sh %s" % (kernel_version))
 
     utils.sysexec_noerr("umount %s/sys" % SYSIMG_PATH)
     utils.sysexec_noerr("umount %s/dev" % SYSIMG_PATH)