From 33453215d8d7193585772784cdf94a758cc97654 Mon Sep 17 00:00:00 2001
From: Chris Lumens <clumens@redhat.com>
Date: Jan 08 2010 22:27:18 +0000
Subject: Don't wait on the filtertype screen on kickstart installs.


Since ignoredisk is an optional command and leaving it out of a kickstart
file means you don't want to ignore anything, there's no reason to stop
on that screen and wait for input if ignoredisk was not specified.  However,
if this is an interactive kickstart install we do still need to stop and
ask.

---

diff --git a/kickstart.py b/kickstart.py
index 6c3e39c..e3db519 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -329,7 +329,7 @@ class Firstboot(commands.firstboot.FC3_Firstboot):
 
 class IgnoreDisk(commands.ignoredisk.F8_IgnoreDisk):
     def parse(self, args):
-        retval = commands.clearpart.F8_IgnoreDisk.parse(self, args)
+        retval = commands.ignoredisk.F8_IgnoreDisk.parse(self, args)
 
         # See comment in ClearPart.parse
         drives = []
@@ -1393,12 +1393,18 @@ def setSteps(anaconda):
     # Storage is initialized for us right when kickstart processing starts.
     dispatch.skipStep("storageinit")
 
-    # Don't show confirmation screens on non-interactive installs.
     if not interactive:
+        # Don't show confirmation screens on non-interactive installs.
         dispatch.skipStep("confirminstall")
         dispatch.skipStep("confirmupgrade")
         dispatch.skipStep("welcome")
 
+        # Since ignoredisk is optional and not specifying it means you want to
+        # consider all possible disks, we should not stop on the filter steps
+        # unless it's an interactive install.
+        dispatch.skipStep("filter")
+        dispatch.skipStep("filtertype")
+
     # Make sure to automatically reboot even in interactive if told to.
     if interactive and ksdata.reboot.action in [KS_REBOOT, KS_SHUTDOWN]:
         dispatch.skipStep("complete")