X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FChainBootNode.py;h=5e7babff6285e370c287aa24b7c64a296f2b8263;hb=5596c3347951b1da8136989073334b8df05b4d87;hp=848cb3dea2a540c10b107d20b3cd72d0ae974e7e;hpb=de097babb0bc5240453f5e061d0ca3d2957fc4c4;p=bootmanager.git diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py index 848cb3d..5e7babf 100644 --- a/source/steps/ChainBootNode.py +++ b/source/steps/ChainBootNode.py @@ -10,18 +10,18 @@ import string import re import os +import time -import UpdateNodeConfiguration -import MakeInitrd -import StopRunlevelAgent -from Exceptions import * import utils import systeminfo -import BootAPI import notify_messages -import time - +import BootAPI import ModelOptions +from Exceptions import BootManagerException + +import UpdateNodeConfiguration +import StopRunlevelAgent +import MakeInitrd def Run( vars, log ): """ @@ -109,8 +109,9 @@ def Run( vars, log ): # update configuration files log.write( "Updating configuration files.\n" ) + # avoid using conf_files initscript as we're moving to systemd on some platforms try: - cmd = "/etc/init.d/conf_files start --noscripts" + cmd = "/usr/bin/env python /usr/share/NodeManager/conf_files.py --noscripts" utils.sysexec_chroot( SYSIMG_PATH, cmd, log ) except IOError, e: log.write("conf_files failed with \n %s" % e) @@ -125,7 +126,9 @@ def Run( vars, log ): utils.sysexec_chroot( SYSIMG_PATH, cmd, log ) # Re-generate initrd right before kexec call - MakeInitrd.Run( vars, log ) + # this is not required anymore on recent depls. + if vars['virt'] == 'vs': + MakeInitrd.Run( vars, log ) # the following step should be done by NM UpdateNodeConfiguration.Run( vars, log ) @@ -151,8 +154,29 @@ def Run( vars, log ): option = 'smp' log.write( "Copying kernel and initrd for booting.\n" ) - utils.sysexec( "cp %s/boot/kernel-boot%s /tmp/kernel" % (SYSIMG_PATH,option), log ) - utils.sysexec( "cp %s/boot/initrd-boot%s /tmp/initrd" % (SYSIMG_PATH,option), log ) + if vars['virt'] == 'vs': + utils.sysexec( "cp %s/boot/kernel-boot%s /tmp/kernel" % (SYSIMG_PATH,option), log ) + utils.sysexec( "cp %s/boot/initrd-boot%s /tmp/initrd" % (SYSIMG_PATH,option), log ) + else: + # Use chroot to call rpm, b/c the bootimage&nodeimage rpm-versions may not work together + kversion = os.popen("chroot %s rpm -qa kernel | tail -1 | cut -c 8-" % SYSIMG_PATH).read().rstrip() + utils.sysexec( "cp %s/boot/vmlinuz-%s /tmp/kernel" % (SYSIMG_PATH,kversion), log ) + candidates=[] + # f16/18: expect initramfs image here + candidates.append ("/boot/initramfs-%s.img"%(kversion)) + # f20: uses a uid of some kind, e.g. /boot/543f88c129de443baaa65800cf3927ce//initrd + candidates.append ("/boot/*/%s/initrd"%(kversion)) + def find_file_in_sysimg (candidates): + import glob + for pattern in candidates: + matches=glob.glob(SYSIMG_PATH+pattern) + log.write("locating initrd: found %d matches in %s\n"%(len(matches),pattern)) + if matches: return matches[0] + initrd=find_file_in_sysimg(candidates) + if initrd: + utils.sysexec( "cp %s /tmp/initrd" % initrd, log ) + else: + raise Exception,"Unable to locate initrd - bailing out" BootAPI.save(vars) @@ -189,7 +213,10 @@ def Run( vars, log ): utils.sysexec_noerr( "killall dhclient", log ) - utils.sysexec_noerr( "umount -a -r -t ext2,ext3", log ) + if vars['virt'] == 'vs': + utils.sysexec_noerr( "umount -a -r -t ext2,ext3", log ) + else: + utils.sysexec_noerr( "umount -a -r -t ext2,ext3,btrfs", log ) utils.sysexec_noerr( "modprobe -r lvm-mod", log ) # modules that should not get unloaded