import UpdateNodeConfiguration
import MakeInitrd
+import StopRunlevelAgent
from Exceptions import *
import utils
import systeminfo
utils.sysexec_chroot( SYSIMG_PATH, cmd, log )
# Re-generate initrd right before kexec call
- MakeInitrd.Run( vars, log )
+ #MakeInitrd.Run( vars, log )
# the following step should be done by NM
UpdateNodeConfiguration.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 )
+ kversion = os.popen('rpm -r /tmp/mnt/sysimg -qa kernel | tail -1 | cut -c 8-').read().rstrip()
+
+ utils.sysexec( "cp %s/boot/vmlinuz-%s /tmp/kernel" % (SYSIMG_PATH,kversion), log )
+ utils.sysexec( "cp %s/boot/initramfs-%s.img /tmp/initrd" % (SYSIMG_PATH,kversion), log )
BootAPI.save(vars)
vars['ROOT_MOUNTED']= 0
# Change runlevel to 'boot' prior to kexec.
- StopRunLevelAgent.Run( vars, log )
+ StopRunlevelAgent.Run( vars, log )
log.write( "Unloading modules and chain booting to new kernel.\n" )
utils.sysexec_noerr( "killall dhclient", log )
- utils.sysexec_noerr( "umount -a -r -t ext2,ext3", log )
+ 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