git://git.onelab.eu
/
bootmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
a first stab at upgrading nodes
[bootmanager.git]
/
source
/
BootManager.py
diff --git
a/source/BootManager.py
b/source/BootManager.py
index
c1c2f85
..
55686ea
100755
(executable)
--- 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'
# '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)
# runinstaller
InstallInit.Run(self.VARS, self.LOG)
+ # do not erase disks in upgrade mode
if not upgrade:
InstallPartitionDisks.Run(self.VARS, self.LOG)
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'
InstallWriteConfig.Run(self.VARS, self.LOG)
InstallUninitHardware.Run(self.VARS, self.LOG)
self.VARS['BOOT_STATE'] = 'boot'
@@
-377,7
+379,7
@@
def main(argv):
import utils
utils.prompt_for_breakpoint_mode()
import utils
utils.prompt_for_breakpoint_mode()
-# utils.breakpoint
("Entering BootManager::main")
+# utils.breakpoint("Entering BootManager::main")
# set to 1 if error occurred
error = 0
# set to 1 if error occurred
error = 0