get nodeimage kernel version using nodeimage rpm via chroot; this avoids rpm-db versi...

[bootmanager.git] / source / steps / ChainBootNode.py

diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py
index 6b1a0c4..4c2149a 100644 (file)
--- 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
-from Exceptions import *
 import utils
 import systeminfo
-import BootAPI
 import notify_messages
-import time
-
+import BootAPI
+import Exceptions
 import ModelOptions
 
+import UpdateNodeConfiguration
+import StopRunlevelAgent
+
 def Run( vars, log ):
     """
     Load the kernel off of a node and boot to it.
@@ -63,9 +63,9 @@ def Run( vars, log ):
             raise ValueError, "PARTITIONS"
 
     except KeyError, var:
-        raise BootManagerException, "Missing variable in vars: %s\n" % var
+        raise Exceptions.BootManagerException, "Missing variable in vars: %s\n" % var
     except ValueError, var:
-        raise BootManagerException, "Variable in vars, shouldn't be: %s\n" % var
+        raise Exceptions.BootManagerException, "Variable in vars, shouldn't be: %s\n" % var
 
     ROOT_MOUNTED= 0
     if vars.has_key('ROOT_MOUNTED'):
@@ -124,7 +124,7 @@ def Run( vars, log ):
     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 )
@@ -150,8 +150,11 @@ 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 )
+    # 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 )
+    utils.sysexec( "cp %s/boot/initramfs-%s.img /tmp/initrd" % (SYSIMG_PATH,kversion), log )
 
     BootAPI.save(vars)
 
@@ -167,7 +170,7 @@ def Run( vars, log ):
     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" )
 
@@ -188,7 +191,7 @@ def Run( vars, log ):
 
     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
@@ -272,7 +275,7 @@ def Run( vars, log ):
     utils.breakpoint ("Before kexec");
     try:
         utils.sysexec( 'kexec --force --initrd=/tmp/initrd --append="%s" /tmp/kernel' % kargs, log)
-    except BootManagerException, e:
+    except Exceptions.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
         # systems unmounted. write out the error, and cancel the boot process