vgchange is required so that /dev/mapper/* and /dev/planetlab/* show up when upgrading

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

diff --git a/source/steps/InstallBootstrapFS.py b/source/steps/InstallBootstrapFS.py
index 7449b2c..0442097 100644 (file)
--- a/source/steps/InstallBootstrapFS.py
+++ b/source/steps/InstallBootstrapFS.py
@@ -85,15 +85,12 @@ def Run(vars, upgrade, log):
         log.write("Upgrade mode init : Scanning for devices\n")
         systeminfo.get_block_devices_dict(vars, log)
         utils.sysexec_noerr("vgscan --mknodes", log)
+        utils.sysexec_noerr("vgchange -ay", log)
 
     # debugging info - show in either mode
-    log.write("In InstallBootstrapFS : DEVICES status BEG\n")
-    utils.sysexec_noerr("vgdisplay", log)
-    utils.sysexec_noerr("pvdisplay", log)
-    for name, path in PARTITIONS.items():
-        log.write("PARTITIONS[{}]={}\n".format(name,path))
-        utils.sysexec_noerr("ls -l {}".format(path), log)
-    log.write("In InstallBootstrapFS : DEVICES status END\n")
+    utils.display_disks_status(PARTITIONS, "In InstallBootstrapFS", log)
+
+    utils.breakpoint("we need to make /dev/mapper/* appear")
 
     log.write("turning on swap space\n")
     utils.sysexec("swapon {}".format(PARTITIONS["swap"]), log)
@@ -286,7 +283,11 @@ def CleanupSysimgBeforeUpgrade(sysimg, target_nodefamily, log):
     # moving from vservers to lxc also means another filesystem
     # so plain reinstall is the only option
     if installed_virt != 'lxc':
-        raise BootManagerException("Can only upgrade nodes running lxc containers (vservers not supported)")
+        message = """Can only upgrade nodes already running lxc containers
+a node running vservers has its /vservers/ partition formatted as ext3 
+and we need btrfs to move to containers
+your only option here is reinstall"""
+        raise BootManagerException(message)
 
     # changing arch is not reasonable either
     if target_arch != installed_arch: