cleanup of breakpoints - no functional change

[bootmanager.git] / source / BootManager.py

diff --git a/source/BootManager.py b/source/BootManager.py
index c4eea37..8d4c979 100755 (executable)
--- a/source/BootManager.py
+++ b/source/BootManager.py
@@ -215,8 +215,6 @@ class BootManager:
             InstallPartitionDisks.Run( self.VARS, self.LOG )            
             InstallBootstrapRPM.Run( self.VARS, self.LOG )            
             InstallWriteConfig.Run( self.VARS, self.LOG )
-            InstallBuildVServer.Run( self.VARS, self.LOG )
-            InstallNodeInit.Run( self.VARS, self.LOG )
             InstallUninitHardware.Run( self.VARS, self.LOG )
             self.VARS['BOOT_STATE']= 'boot'
             self.VARS['STATE_CHANGE_NOTIFY']= 1
@@ -237,10 +235,10 @@ class BootManager:
             UpdateBootStateWithPLC.Run( self.VARS, self.LOG )
             _rinsRun()
 
-        def _debugRun():
+        def _debugRun(state='dbg'):
             # implements debug logic, which just starts the sshd
             # and just waits around
-            self.VARS['BOOT_STATE']='dbg'
+            self.VARS['BOOT_STATE']=state
             UpdateBootStateWithPLC.Run( self.VARS, self.LOG )
             StartDebug.Run( self.VARS, self.LOG )
 
@@ -256,6 +254,8 @@ class BootManager:
         NodeRunStates['rins'] = _rinsRun
         NodeRunStates['boot'] = _bootRun
         NodeRunStates['dbg']  = _debugRun
+        NodeRunStates['diag']  = lambda : _debugRun('diag')
+        NodeRunStates['disable']  = lambda : _debugRun('disable')
 
         success = 0
         try:
@@ -296,11 +296,19 @@ class BootManager:
             
             
 def main(argv):
+
+    import utils
+    utils.prompt_for_breakpoint_mode()
+
+    #utils.breakpoint ("Entering BootManager::main")
+    
     global NodeRunStates
     NodeRunStates = {'new':None,
                      'inst':None,
                      'rins':None,
                      'boot':None,
+                                        'diag':None,
+                                        'disable':None,
                      'dbg':None}
 
     # set to 1 if error occurred