There may be cases when we don't get exit code. Especially in those nonstandard case we should honor the 'nokill' flag and don't reboot the machine.
Signed-off-by: Vratislav Podzimek vpodzime@redhat.com --- anaconda | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/anaconda b/anaconda index 90fad45..bc6f5c8 100755 --- a/anaconda +++ b/anaconda @@ -43,12 +43,12 @@ def exitHandler(rebootData, storage, exitCode=None): if exitCode: anaconda.intf.shutdown()
- if "nokill" in flags.cmdline: - iutil.vtActivate(1) - print "anaconda halting due to nokill flag." - print "The system will be rebooted when you press Ctrl-Alt-Delete." - while True: - time.sleep(10000) + if "nokill" in flags.cmdline: + iutil.vtActivate(1) + print "anaconda halting due to nokill flag." + print "The system will be rebooted when you press Ctrl-Alt-Delete." + while True: + time.sleep(10000)
if image_count: anaconda.storage.umountFilesystems(ignoreErrors=True, swapoff=False)