fix for when upgrading too old nodes

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

diff --git a/source/steps/InstallBootstrapFS.py b/source/steps/InstallBootstrapFS.py
index c0f27cb..63f69ab 100644 (file)
--- a/source/steps/InstallBootstrapFS.py
+++ b/source/steps/InstallBootstrapFS.py
@@ -85,6 +85,7 @@ 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
     utils.display_disks_status(PARTITIONS, "In InstallBootstrapFS", log)
@@ -276,13 +277,17 @@ def CleanupSysimgBeforeUpgrade(sysimg, target_nodefamily, log):
         with open("{}/etc/planetlab/virt".format(sysimg)) as infile:
             installed_virt = infile.read().strip()
     except Exception as e:
-        print_exc()
+        traceback.print_exc()
         raise BootManagerException("Could not retrieve data about previous installation - cannot upgrade")
 
     # 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: