avoid using conf_files initscript that might go when moving to systemd

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

diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py
index 75428aa..5e7babf 100644 (file)
--- a/source/steps/ChainBootNode.py
+++ b/source/steps/ChainBootNode.py
@@ -21,6 +21,7 @@ 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)
@@ -159,7 +161,22 @@ def Run( vars, 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 )
+        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))
+        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)