ROOT_SIZE is a string not a number

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

diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py
index 5e7babf..59d58f9 100644 (file)
--- a/source/steps/ChainBootNode.py
+++ b/source/steps/ChainBootNode.py
@@ -159,13 +159,21 @@ def Run( vars, 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
-        kversion = os.popen("chroot %s rpm -qa kernel | tail -1 | cut -c 8-" % SYSIMG_PATH).read().rstrip()
+        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: