git://git.onelab.eu
/
bootmanager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b53692c
)
merge from trunk 10727:10728
author
Stephen Soltesz
<soltesz@cs.princeton.edu>
Tue, 30 Sep 2008 21:51:37 +0000
(21:51 +0000)
committer
Stephen Soltesz
<soltesz@cs.princeton.edu>
Tue, 30 Sep 2008 21:51:37 +0000
(21:51 +0000)
source/steps/StartDebug.py
patch
|
blob
|
history
diff --git
a/source/steps/StartDebug.py
b/source/steps/StartDebug.py
index
7796ec8
..
1bc6d23
100644
(file)
--- a/
source/steps/StartDebug.py
+++ b/
source/steps/StartDebug.py
@@
-120,15
+120,14
@@
def Run( vars, log ):
else:
log.write( "sshd already running\n" )
+
+ # this will make the initial script stop requesting scripts from PLC
+ utils.sysexec( "touch %s" % cancel_boot_flag, log )
# for ease of use, setup lvm on 2.x cds
if BOOT_CD_VERSION[0] == 2:
compatibility.setup_lvm_2x_cd(vars,log)
-
- # this will make the initial script stop requesting scripts from PLC
- utils.sysexec( "touch %s" % cancel_boot_flag, log )
-
print message
return