From: Stephen Soltesz Date: Tue, 30 Sep 2008 21:51:37 +0000 (+0000) Subject: merge from trunk 10727:10728 X-Git-Tag: BootManager-3.2-14~5 X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=54bc4089f492c9d1f0eca76f406f235d5867f9fa merge from trunk 10727:10728 --- diff --git a/source/steps/StartDebug.py b/source/steps/StartDebug.py index 7796ec8..1bc6d23 100644 --- 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