bugfixes for the location of kernel and initrd as observed on recent f23

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

diff --git a/source/steps/ValidateNodeInstall.py b/source/steps/ValidateNodeInstall.py
index 529400d..159d4d3 100644 (file)
--- a/source/steps/ValidateNodeInstall.py
+++ b/source/steps/ValidateNodeInstall.py
@@ -71,7 +71,7 @@ def Run(vars, log):
         # simply creating an instance of this class and listing the system
         # block devices will make them show up so vgscan can find the planetlab
         # volume group
-        systeminfo.get_block_device_list(vars, log)
+        systeminfo.get_block_devices_dict(vars, log)
 
         try:
             utils.sysexec("vgscan", log)
@@ -157,7 +157,7 @@ def Run(vars, log):
                 os.stat("{}/boot/vmlinuz-{}".format(SYSIMG_PATH, kversion))
                 major_version = int(kversion[0]) # Check if the string looks like a kernel version
             except:
-                kversion = os.popen("ls -lrt {}/lib/modules | tail -1 | awk '{print $9;}'"\
+                kversion = os.popen("ls -lrt {}/lib/modules | tail -1 | awk '{{print $9;}}'"\
                                     .format(SYSIMG_PATH)).read().rstrip()
     except OSError as e:            
         log.write("Couldn't locate base kernel (you might be using the stock kernel).\n")