#!/usr/bin/python
-
+#
# Copyright (c) 2003 Intel Corporation
# All rights reserved.
#
import re
import os
-import UpdateBootStateWithPLC
import UpdateNodeConfiguration
+import MakeInitrd
from Exceptions import *
import utils
import systeminfo
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
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 )
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
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
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
# modules that should not get unloaded
# unloading cpqphp causes a kernel panic
- blacklist = [ "floppy", "cpqphp", "i82875p_edac" ]
+ blacklist = [ "floppy", "cpqphp", "i82875p_edac", "mptspi"]
try:
modules= file("/tmp/loadedmodules","r")
# kargs, which is ramdisk_size=8192
pass
+ 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