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
fix for f14
[bootmanager.git]
/
source
/
steps
/
MakeInitrd.py
diff --git
a/source/steps/MakeInitrd.py
b/source/steps/MakeInitrd.py
index
576a679
..
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.
# 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
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,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
# 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.sysexec("mount -t sysfs none %s/sys" % SYSIMG_PATH)
initrd, kernel_version= systeminfo.getKernelVersion(vars,log)
@@
-75,7
+76,7
@@
def Run( vars, log ):
# 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)