# 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
+ # xxx tmp - trying to work around the f14 case:
+ # check that /dev/ is mounted with devtmpfs
+ # tmp - sysexec_noerr not returning what one would expect
+ # if utils.sysexec_noerr ("grep devtmpfs /proc/mounts") != 0:
+ utils.sysexec_noerr("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)
- 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 )
+ # specify ext3 for fedora14 and above as their default fs is ext4
+ utils.sysexec_chroot( SYSIMG_PATH, "mkinitrd -v --with=ext3 --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)