# Copyright (c) 2004-2006 The Trustees of Princeton University
# All rights reserved.
-import os, string
+import os
from Exceptions import *
import utils
import systeminfo
-import shutil
def kernelHasMkinitrd():
# Older bootcds only support LinuxThreads. This hack is to get mkinitrd
# 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
+ utils.sysexec_noerr("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)
try:
utils.removefile( "%s/boot/%s" % (SYSIMG_PATH, initrd) )
except:
- print "%s/boot/%s is already removed" % (SYSIMG_PATH, initrd) )
+ print "%s/boot/%s is already removed" % (SYSIMG_PATH, initrd)
# hack for CentOS 5.3
bypassRaidIfNeeded(SYSIMG_PATH)
if kernelHasMkinitrd() == True:
- utils.sysexec_chroot( SYSIMG_PATH, "mkinitrd -v /boot/initrd-%s.img %s" % \
+ 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)