X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=blobdiff_plain;f=source%2FBootManager.py;h=55686ea08ad740ff8db69911444c0263515c5572;hp=2d9db0b6b57b0ed54ca211de5d32f89413b0e33a;hb=d7f858a139c1b935b65e38a2d2b364a578b0a26f;hpb=bca9d15033c15123b21196e9f24fac8c1b84675d

diff --git a/source/BootManager.py b/source/BootManager.py
index 2d9db0b..55686ea 100755
--- a/source/BootManager.py
+++ b/source/BootManager.py
@@ -276,13 +276,15 @@ class BootManager:
             # 'boot' state and chainboot into the production system
             if not CheckHardwareRequirements.Run(self.VARS, self.LOG):
                 self.VARS['RUN_LEVEL'] = 'failboot'
-                raise BootManagerException, "Hardware requirements not met."
+                raise BootManagerException("Hardware requirements not met.")
 
             # runinstaller
             InstallInit.Run(self.VARS, self.LOG)
+            # do not erase disks in upgrade mode
             if not upgrade:
                 InstallPartitionDisks.Run(self.VARS, self.LOG)
-            InstallBootstrapFS.Run(self.VARS, self.LOG)
+            # pass upgrade boolean to this step so we can do extra cleanup
+            InstallBootstrapFS.Run(self.VARS, upgrade, self.LOG)
             InstallWriteConfig.Run(self.VARS, self.LOG)
             InstallUninitHardware.Run(self.VARS, self.LOG)
             self.VARS['BOOT_STATE'] = 'boot'