X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FChainBootNode.py;h=292a901896b69a69941287a5aa30824cf0974a8e;hb=858dc952b15d2876373c38911a2173aa0bf522a9;hp=2e7a5dafc450a3a00100d2be05b4684978c33438;hpb=6b0ae75c98557e006c98509be4d4c13e75dd5606;p=bootmanager.git diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py index 2e7a5da..292a901 100644 --- a/source/steps/ChainBootNode.py +++ b/source/steps/ChainBootNode.py @@ -1,5 +1,8 @@ -#!/usr/bin/python2 - +#!/usr/bin/python +# +# $Id$ +# $URL$ +# # Copyright (c) 2003 Intel Corporation # All rights reserved. # @@ -11,10 +14,10 @@ import string import re import os -import UpdateBootStateWithPLC +import UpdateNodeConfiguration +import MakeInitrd from Exceptions import * import utils -import compatibility import systeminfo import BootAPI import notify_messages @@ -30,7 +33,6 @@ def Run( vars, log ): booting has occurred. Expect the following variables: - BOOT_CD_VERSION A tuple of the current bootcd version SYSIMG_PATH the path where the system image will be mounted (always starts with TEMP_PATH) ROOT_MOUNTED the node root file system is mounted @@ -46,10 +48,6 @@ def Run( vars, log ): # make sure we have the variables we need try: - BOOT_CD_VERSION= vars["BOOT_CD_VERSION"] - if BOOT_CD_VERSION == "": - raise ValueError, "BOOT_CD_VERSION" - SYSIMG_PATH= vars["SYSIMG_PATH"] if SYSIMG_PATH == "": raise ValueError, "SYSIMG_PATH" @@ -73,16 +71,12 @@ def Run( vars, log ): raise BootManagerException, "Variable in vars, shouldn't be: %s\n" % var ROOT_MOUNTED= 0 - if 'ROOT_MOUNTED' in vars.keys(): + if vars.has_key('ROOT_MOUNTED'): ROOT_MOUNTED= vars['ROOT_MOUNTED'] if ROOT_MOUNTED == 0: log.write( "Mounting node partitions\n" ) - # old cds need extra utilities to run lvm - if BOOT_CD_VERSION[0] == 2: - compatibility.setup_lvm_2x_cd( vars, log ) - # simply creating an instance of this class and listing the system # block devices will make them show up so vgscan can find the planetlab # volume group @@ -95,10 +89,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 @@ -119,18 +113,24 @@ def Run( vars, log ): log.write( "Updating configuration files.\n" ) try: cmd = "/etc/init.d/conf_files start --noscripts" - utils.sysexec( "chroot %s %s" % (SYSIMG_PATH, cmd), log ) + 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 + MakeInitrd.Run( vars, log ) + + # the following step should be done by NM + UpdateNodeConfiguration.Run( vars, log ) log.write( "Updating ssh public host key with PLC.\n" ) ssh_host_key= "" @@ -143,7 +143,7 @@ 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 @@ -158,17 +158,10 @@ def Run( vars, log ): 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( "umount %s" % SYSIMG_PATH, log ) + utils.sysexec( "vgchange -an", log ) ROOT_MOUNTED= 0 vars['ROOT_MOUNTED']= 0 @@ -190,25 +183,25 @@ def Run( vars, log ): utils.sysexec_noerr( "ifconfig eth0 down", log ) - if BOOT_CD_VERSION[0] == 2: - utils.sysexec_noerr( "killall dhcpcd", log ) - elif BOOT_CD_VERSION[0] >= 3: - utils.sysexec_noerr( "killall dhclient", log ) + utils.sysexec_noerr( "killall dhclient", log ) utils.sysexec_noerr( "umount -a -r -t ext2,ext3", log ) utils.sysexec_noerr( "modprobe -r lvm-mod", log ) + # modules that should not get unloaded + # unloading cpqphp causes a kernel panic + blacklist = [ "floppy", "cpqphp", "i82875p_edac", "mptspi"] try: modules= file("/tmp/loadedmodules","r") for line in modules: module= string.strip(line) - if module == "floppy": - log.write("Skipping unload of floppy kernel module.\n") + if module in blacklist : + log.write("Skipping unload of kernel module '%s'.\n"%module) elif module != "": log.write( "Unloading %s\n" % module ) utils.sysexec_noerr( "modprobe -r %s" % module, log ) - if module == "e1000": + if "e1000" in module: log.write("Unloading e1000 driver; sleeping 4 seconds...\n") time.sleep(4) @@ -272,6 +265,7 @@ def Run( vars, log ): # kargs, which is ramdisk_size=8192 pass + utils.sysexec_noerr( 'hwclock --systohc --utc ' ) utils.breakpoint ("Before kexec"); try: utils.sysexec( 'kexec --force --initrd=/tmp/initrd ' \