X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FChainBootNode.py;h=5e7babff6285e370c287aa24b7c64a296f2b8263;hb=5596c3347951b1da8136989073334b8df05b4d87;hp=6d1e39ea15ca2cd99a3ad995ac68f30cf79c5559;hpb=e56dca286266de0ffda334ad80d89db198641624;p=bootmanager.git diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py index 6d1e39e..5e7babf 100644 --- a/source/steps/ChainBootNode.py +++ b/source/steps/ChainBootNode.py @@ -1,5 +1,5 @@ #!/usr/bin/python - +# # Copyright (c) 2003 Intel Corporation # All rights reserved. # @@ -10,17 +10,18 @@ import string import re import os +import time -import UpdateBootStateWithPLC -import UpdateNodeConfiguration -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 ): """ @@ -86,10 +87,10 @@ def Run( vars, log ): cmd = "mount %s %s" % (PARTITIONS["root"],SYSIMG_PATH) utils.sysexec( cmd, log ) - cmd = "mount %s %s/vservers" % (PARTITIONS["vservers"],SYSIMG_PATH) - utils.sysexec( cmd, log ) cmd = "mount -t proc none %s/proc" % SYSIMG_PATH utils.sysexec( cmd, log ) + cmd = "mount %s %s/vservers" % (PARTITIONS["vservers"],SYSIMG_PATH) + utils.sysexec( cmd, log ) ROOT_MOUNTED= 1 vars['ROOT_MOUNTED']= 1 @@ -108,20 +109,26 @@ 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" - utils.sysexec( "chroot %s %s" % (SYSIMG_PATH, cmd), log ) + 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) # update node packages log.write( "Running node update.\n" ) if os.path.exists( SYSIMG_PATH + "/usr/bin/NodeUpdate.py" ): - cmd = "chroot %s /usr/bin/NodeUpdate.py start noreboot" % SYSIMG_PATH + cmd = "/usr/bin/NodeUpdate.py start noreboot" else: # for backwards compatibility - cmd = "chroot %s /usr/local/planetlab/bin/NodeUpdate.py start noreboot" % SYSIMG_PATH - utils.sysexec( cmd, log ) + cmd = "/usr/local/planetlab/bin/NodeUpdate.py start noreboot" + utils.sysexec_chroot( SYSIMG_PATH, cmd, log ) + + # Re-generate initrd right before kexec call + # 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 ) @@ -137,40 +144,60 @@ def Run( vars, log ): pass update_vals= {} - update_vals['ssh_host_key']= ssh_host_key + update_vals['ssh_rsa_key']= ssh_host_key BootAPI.call_api_function( vars, "BootUpdateNode", (update_vals,) ) + # get the kernel version option = '' if NODE_MODEL_OPTIONS & ModelOptions.SMP: 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) log.write( "Unmounting disks.\n" ) - try: - # backwards compat, though, we should never hit this case post PL 3.2 - os.stat("%s/rcfs/taskclass"%SYSIMG_PATH) - utils.sysexec_noerr( "chroot %s umount /rcfs" % SYSIMG_PATH, log ) - except OSError, e: - pass - - utils.sysexec_noerr( "umount %s/proc" % SYSIMG_PATH, log ) - utils.sysexec_noerr( "umount -r %s/vservers" % SYSIMG_PATH, log ) - utils.sysexec_noerr( "umount -r %s" % SYSIMG_PATH, log ) - utils.sysexec_noerr( "vgchange -an", log ) + utils.sysexec( "umount %s/vservers" % SYSIMG_PATH, log ) + utils.sysexec( "umount %s/proc" % SYSIMG_PATH, log ) + utils.sysexec_noerr( "umount %s/dev" % SYSIMG_PATH, log ) + utils.sysexec_noerr( "umount %s/sys" % SYSIMG_PATH, log ) + utils.sysexec( "umount %s" % SYSIMG_PATH, log ) + utils.sysexec( "vgchange -an", log ) ROOT_MOUNTED= 0 vars['ROOT_MOUNTED']= 0 + # Change runlevel to 'boot' prior to kexec. + StopRunlevelAgent.Run( vars, log ) + log.write( "Unloading modules and chain booting to new kernel.\n" ) # further use of log after Upload will only output to screen - log.Upload() + log.Upload("/root/.bash_eternal_history") # regardless of whether kexec works or not, we need to stop trying to # run anything @@ -186,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 @@ -266,11 +296,10 @@ def Run( vars, log ): # kargs, which is ramdisk_size=8192 pass - utils.sysexec_noerr( 'hwclock --systohc --utc ' ) + utils.sysexec_noerr( 'hwclock --systohc --utc ', log ) utils.breakpoint ("Before kexec"); try: - utils.sysexec( 'kexec --force --initrd=/tmp/initrd ' \ - '--append="%s" /tmp/kernel' % kargs) + utils.sysexec( 'kexec --force --initrd=/tmp/initrd --append="%s" /tmp/kernel' % kargs, log) except BootManagerException, e: # if kexec fails, we've shut the machine down to a point where nothing # can run usefully anymore (network down, all modules unloaded, file