simplified PARTITIONS to use one entry per each partition

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

diff --git a/source/steps/ChainBootNode.py b/source/steps/ChainBootNode.py
index 8eac1d1..d298dea 100644 (file)
--- a/source/steps/ChainBootNode.py
+++ b/source/steps/ChainBootNode.py
@@ -78,7 +78,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)
         
         utils.sysexec("vgscan", log)
         utils.sysexec("vgchange -ay planetlab", log)
@@ -94,7 +94,8 @@ def Run(vars, log):
 
         ROOT_MOUNTED = 1
         vars['ROOT_MOUNTED'] = 1
-        
+
+    utils.display_disks_status(PARTITIONS, "In ChainBootNode", log)
 
     # write out the session value /etc/planetlab/session
     try:
@@ -197,10 +198,10 @@ def Run(vars, log):
     
     if (vars['ONE_PARTITION'] != '1'):
         utils.sysexec("umount {}/vservers".format(SYSIMG_PATH), log)
-    utils.sysexec("umount {}s/proc".format(SYSIMG_PATH), log)
-    utils.sysexec_noerr("umount {}s/dev".format(SYSIMG_PATH), log)
-    utils.sysexec_noerr("umount {}s/sys".format(SYSIMG_PATH), log)
-    utils.sysexec("umount {}s".format(SYSIMG_PATH), log)
+    utils.sysexec("umount {}/proc".format(SYSIMG_PATH), log)
+    utils.sysexec_noerr("umount {}/dev".format(SYSIMG_PATH), log)
+    utils.sysexec_noerr("umount {}/sys".format(SYSIMG_PATH), log)
+    utils.sysexec("umount {}".format(SYSIMG_PATH), log)
     utils.sysexec("vgchange -an", log)
 
     ROOT_MOUNTED = 0
@@ -296,7 +297,7 @@ def Run(vars, log):
         log.write("Couldn't read /proc/modules, continuing.\n")
 
 
-    kargs = "root={} ramdisk_size=8192".format(PARTITIONS["mapper-root"])
+    kargs = "root={} ramdisk_size=8192".format(PARTITIONS["root"])
     if NODE_MODEL_OPTIONS & ModelOptions.SMP:
         kargs = kargs + " " + "acpi=off"
     try:
@@ -312,7 +313,7 @@ def Run(vars, log):
         pass 
 
     utils.sysexec_noerr('hwclock --systohc --utc ', log)
-    utils.breakpoint ("Before kexec");
+#    utils.breakpoint("Before kexec");
     try:
         utils.sysexec('kexec --force --initrd=/tmp/initrd --append="{}" /tmp/kernel'.format(kargs), log)
     except BootManagerException as e: