git://git.onelab.eu
/
bootmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
workaround for f14 bootCD
[bootmanager.git]
/
source
/
steps
/
MakeInitrd.py
diff --git
a/source/steps/MakeInitrd.py
b/source/steps/MakeInitrd.py
index
bf1ba95
..
e40f9fd
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.
# Copyright (c) 2004-2006 The Trustees of Princeton University
# All rights reserved.
-import os
, string
+import os
from Exceptions import *
import utils
import systeminfo
from Exceptions import *
import utils
import systeminfo
-import shutil
def kernelHasMkinitrd():
# Older bootcds only support LinuxThreads. This hack is to get mkinitrd
def kernelHasMkinitrd():
# Older bootcds only support LinuxThreads. This hack is to get mkinitrd
@@
-63,6
+62,10
@@
def Run( vars, log ):
# mkinitrd needs /dev and /proc to do the right thing.
# /proc is already mounted, so bind-mount /dev here
# 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
+ 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)
utils.sysexec("mount -o bind /dev %s/dev" % SYSIMG_PATH)
utils.sysexec("mount -t sysfs none %s/sys" % SYSIMG_PATH)
@@
-70,12
+73,12
@@
def Run( vars, log ):
try:
utils.removefile( "%s/boot/%s" % (SYSIMG_PATH, initrd) )
except:
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:
# 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)
(kernel_version, kernel_version), log )
else:
shutil.copy("./mkinitrd.sh","%s/tmp/mkinitrd.sh" % SYSIMG_PATH)