summaryrefslogtreecommitdiffstats
path: root/anaconda
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2012-09-06 11:25:44 -0400
committerChris Lumens <clumens@redhat.com>2012-09-06 11:25:44 -0400
commit346181e9f82f6efb01e545394c2850d3bb657662 (patch)
tree3c0cdd846205a5591a7c0a075adc3f1f200e6d99 /anaconda
parentb8d733642d69aec34ce68743c6996504d20a3e0c (diff)
downloadanaconda-346181e9f82f6efb01e545394c2850d3bb657662.tar.gz
anaconda-346181e9f82f6efb01e545394c2850d3bb657662.tar.xz
anaconda-346181e9f82f6efb01e545394c2850d3bb657662.zip
Quitting the live installer shouldn't reboot the system (#854904).
We were doing reboots before because there was not an obvious reboot/shutdown button anywhere in the live environment. However, that is no longer the case. I've left the end of installation as reboot because it's clearly labeled as such and we shouldn't break the string now.
Diffstat (limited to 'anaconda')
-rwxr-xr-xanaconda4
1 files changed, 1 insertions, 3 deletions
diff --git a/anaconda b/anaconda
index 3da6ada85..ec9fe041c 100755
--- a/anaconda
+++ b/anaconda
@@ -60,7 +60,7 @@ def exitHandler(rebootData, storage, exitCode=None):
loop.controllable = True
device.deactivate(recursive=True)
- if anaconda.ksdata and not flags.imageInstall:
+ if not flags.imageInstall and not flags.livecdInstall:
from pykickstart.constants import KS_SHUTDOWN, KS_WAIT, KS_REBOOT
from pyanaconda.iutil import dracut_eject
@@ -76,8 +76,6 @@ def exitHandler(rebootData, storage, exitCode=None):
os.system("systemctl --no-wall halt")
else: # reboot action is KS_REBOOT or None
os.system("systemctl --no-wall reboot")
- elif flags.livecdInstall:
- os.system("systemctl --no-wall reboot")
def startMetacityWM():
childpid = os.fork()