[PATCH] Quitting the live installer shouldn't reboot the system (#854904).

Chris Lumens clumens at redhat.com
Thu Sep 6 15:27:44 UTC 2012


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.
---
 anaconda | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/anaconda b/anaconda
index 3da6ada..ec9fe04 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()
-- 
1.7.11.2



More information about the anaconda-patches mailing list