diff options
author | Vratislav Podzimek <vpodzime@redhat.com> | 2012-10-12 12:07:26 +0200 |
---|---|---|
committer | Vratislav Podzimek <vpodzime@redhat.com> | 2012-10-12 16:45:13 +0200 |
commit | 2591bcf528ee11d40902a6540bbb4ac3d88c4be7 (patch) | |
tree | 5f13bc9b1dacc4b7ca788fe1fa18d4ec153be432 | |
parent | fbc7589a05c773824888c7e74dfc3826715ec432 (diff) | |
download | anaconda-2591bcf528ee11d40902a6540bbb4ac3d88c4be7.tar.gz anaconda-2591bcf528ee11d40902a6540bbb4ac3d88c4be7.tar.xz anaconda-2591bcf528ee11d40902a6540bbb4ac3d88c4be7.zip |
Always honor the 'nokill' flag
There may be cases when we don't get exit code. Especially in those
nonstandard cases we should honor the 'nokill' flag and don't reboot
the machine.
-rwxr-xr-x | anaconda | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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) |