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
syntax problem; node boot process was failing here
[bootmanager.git]
/
source
/
steps
/
MakeInitrd.py
diff --git
a/source/steps/MakeInitrd.py
b/source/steps/MakeInitrd.py
index
7fa7178
..
576a679
100644
(file)
--- a/
source/steps/MakeInitrd.py
+++ b/
source/steps/MakeInitrd.py
@@
-67,16
+67,20
@@
def Run( vars, log ):
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)
- 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:
# 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 /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)
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)
utils.sysexec_noerr("umount %s/sys" % SYSIMG_PATH)
utils.sysexec_noerr("umount %s/dev" % SYSIMG_PATH)