[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH 4/9] addPartRequest is no longer needed.



Excellent use of minus signs in the diff.

On 03/11/2009 10:32 AM, Chris Lumens wrote:
The new storage code schedules actions, so we don't need to batch all the
requests up to be added later.
---
  kickstart.py |   17 +++--------------
  1 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/kickstart.py b/kickstart.py
index b22c5ef..fe03532 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -998,24 +998,10 @@ class AnacondaKSParser(KickstartParser):

          KickstartParser.handleCommand(self, lineno, args)

-# this adds a partition to the autopartition list replacing anything
-# else with this mountpoint so that you can use autopart and override /
-def addPartRequest(anaconda, request):
-    if not request.mountpoint:
-        anaconda.id.storage.autoPartitionRequests.append(request)
-        return
-
-    for req in anaconda.id.storage.autoPartitionRequests:
-        if req.mountpoint and req.mountpoint == request.mountpoint:
-            anaconda.id.storage.autoPartitionRequests.remove(req)
-            break
-    anaconda.id.storage.autoPartitionRequests.append(request)
-
  def processKickstartFile(anaconda, file):
      # We need to make sure storage is active before the kickstart file is read.
      import storage
      storage.storageInitialize(anaconda)
-    anaconda.dispatch.skipStep("storageinit")

      # parse the %pre
      ksparser = KickstartPreParser(AnacondaKSHandler(anaconda))
@@ -1217,6 +1203,9 @@ def setSteps(anaconda):
      dispatch.skipStep("installtype")
      dispatch.skipStep("network")

+    # 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:
          dispatch.skipStep("confirminstall")


--
David Cantrell <dcantrell redhat com>
Red Hat / Honolulu, HI


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]