X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FInstallBootstrapFS.py;h=63f69abbff849e620448b14c8392c741deac7dd8;hb=9c8e48daf7e6d83ce52cef4ccbdfff34c9056328;hp=1de9d70015b0a7fcf3e9351ad479c959bb21dc32;hpb=d86e809b0ea2de1447e144a38f9ca413b6c68806;p=bootmanager.git

diff --git a/source/steps/InstallBootstrapFS.py b/source/steps/InstallBootstrapFS.py
index 1de9d70..63f69ab 100644
--- a/source/steps/InstallBootstrapFS.py
+++ b/source/steps/InstallBootstrapFS.py
@@ -82,10 +82,16 @@ def Run(vars, upgrade, log):
     # in upgrade mode, since we skip InstallPartitionDisks
     # we need to run this
     if upgrade:
-        log.write("Running vgscan for devices (upgrade mode)\n")
+        log.write("Upgrade mode init : Scanning for devices\n")
         systeminfo.get_block_devices_dict(vars, log)
-        utils.sysexec_noerr("vgscan", 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)
+
+    utils.breakpoint("we need to make /dev/mapper/* appear")
+
     log.write("turning on swap space\n")
     utils.sysexec("swapon {}".format(PARTITIONS["swap"]), log)
 
@@ -271,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: