From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Tue, 18 Dec 2007 18:54:48 +0000 (+0000)
Subject: Cross module commit for 'diag' and 'disabled' node states.
X-Git-Tag: bootmanager-3.2-2~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b585265b99da8526d487fee031dc4a6ddc179a5c;hp=7b32322105ac7b0357de9b9325a1bfeae3dcf8ef;p=bootmanager.git

Cross module commit for 'diag' and 'disabled' node states.
---

diff --git a/source/BootManager.py b/source/BootManager.py
index 5323103..b745eb0 100755
--- a/source/BootManager.py
+++ b/source/BootManager.py
@@ -235,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 )
 
@@ -254,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:
@@ -305,6 +307,8 @@ def main(argv):
                      'inst':None,
                      'rins':None,
                      'boot':None,
+					 'diag':None,
+					 'disable':None,
                      'dbg':None}
 
     # set to 1 if error occurred