reguire gnupg1 on f>=31; sense the system to use gpg1 when installed

[bootmanager.git] / source / BootManager.py

diff --git a/source/BootManager.py b/source/BootManager.py
index 2d9db0b..a24b720 100755 (executable)
--- a/source/BootManager.py
+++ b/source/BootManager.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python -u
+#!/usr/bin/python2 -u
 #
 # Copyright (c) 2003 Intel Corporation
 # All rights reserved.
@@ -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'