If this is a kickstart install, don't eject the CD at this time. The user will

have to specify --eject in their kickstart file now (#238711, #239002).

1 files changed, 8 insertions, 6 deletions

diff --git a/installmethod.py b/installmethod.py
index 7d87e3f42..26716794e 100644
--- a/installmethod.py
+++ b/installmethod.py
@@ -87,19 +87,21 @@ class InstallMethod:
     def postAction(self, anaconda):
         pass
 
-
-# this handles any cleanup needed for the method.  it occurs *very* late
-# (ie immediately before the congratulations screen).  main use right now
-# is ejecting the cdrom
+# This handles any cleanup needed for the method.  It occurs *very* late
+# and is mainly used for unmounting media and ejecting the CD.  If we're on
+# a kickstart install, don't eject the CD since there's a command to do that
+# if the user wants.
 def doMethodComplete(anaconda):
     anaconda.method.filesDone()
-    anaconda.method.ejectCD()
+
+    if not anaconda.isKickstart:
+        anaconda.method.ejectCD()
 
     mtab = "/dev/root / ext3 ro 0 0\n"
     for ent in anaconda.id.fsset.entries:
         if ent.mountpoint == "/":
             mtab = "/dev/root / %s ro 0 0\n" %(ent.fsystem.name,)
-    
+
     f = open(anaconda.rootPath + "/etc/mtab", "w+")
     f.write(mtab)
     f.close()