X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FChainBootNode.py;h=59d58f904af25535dde70a8fdcf134d85a72e3a0;hb=024a094d4d296bd2b80ab85d253a995055f88c0d;hp=6b1a0c4c7f394dcba905ee55a963bcb460d23587;hpb=7a73fb13b2a2af2d470da53fbb43760ea2544638;p=bootmanager.git

diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py
index 6b1a0c4..59d58f9 100644
--- a/source/steps/ChainBootNode.py
+++ b/source/steps/ChainBootNode.py
@@ -10,17 +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 ModelOptions
+from Exceptions import BootManagerException
+
+import UpdateNodeConfiguration
+import StopRunlevelAgent
+import MakeInitrd
 
 def Run( vars, log ):
     """
@@ -108,8 +109,9 @@ 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"
+        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)
@@ -124,7 +126,9 @@ def Run( vars, log ):
     utils.sysexec_chroot( SYSIMG_PATH, cmd, log )
 
     # Re-generate initrd right before kexec call
-    MakeInitrd.Run( vars, log )
+    # 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 )
@@ -150,8 +154,37 @@ 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 )
+    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
+        try:
+            kversion = os.popen("chroot %s rpm -qa kernel | tail -1 | cut -c 8-" % SYSIMG_PATH).read().rstrip()
+            major_version = int(kversion[0]) # Check if the string looks like a kernel version
+        except:
+            # Try a different method for non-rpm-based distributions
+            kversion = os.popen("ls -lrt /lib/modules | tail -1 | awk '{print $9;}'").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/<kversion>/initrd
+        candidates.append ("/boot/*/%s/initrd"%(kversion))
+        # Ubuntu:
+        candidates.append ("/boot/initrd.img%s"%(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)
 
@@ -167,7 +200,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 +221,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