[PATCH 1/3] refactor doKickstartStorage slightly
Brian C. Lane
bcl at redhat.com
Thu Jul 19 00:25:27 UTC 2012
From: "Brian C. Lane" <bcl at redhat.com>
---
pyanaconda/kickstart.py | 7 +++++++
pyanaconda/storage/__init__.py | 5 -----
pyanaconda/ui/gui/spokes/storage.py | 5 +++--
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index de46e38..d0ddf50 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -1478,3 +1478,10 @@ def selectPackages(ksdata, payload):
payload.deselectGroup(grp.name)
except NoSuchGroup:
continue
+
+def doKickstartStorage(storage, ksdata, instclass):
+ """ Setup storage state from the kickstart data """
+ ksdata.clearpart.execute(storage, ksdata, instclass)
+ ksdata.bootloader.execute(storage, ksdata, instclass)
+ ksdata.autopart.execute(storage, ksdata, instclass)
+
diff --git a/pyanaconda/storage/__init__.py b/pyanaconda/storage/__init__.py
index 88038a1..16d3e71 100644
--- a/pyanaconda/storage/__init__.py
+++ b/pyanaconda/storage/__init__.py
@@ -2804,8 +2804,3 @@ def parseFSTab(devicetree, chroot=None):
return (mounts, swaps)
-def doKickstartStorage(storage, ksdata, instclass, checker):
- ksdata.clearpart.execute(storage, ksdata, instclass)
- ksdata.bootloader.execute(storage, ksdata, instclass)
- ksdata.autopart.execute(storage, ksdata, instclass)
- checker.run()
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
index 7a156a4..924bce2 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -47,7 +47,7 @@ from pyanaconda.ui.gui.spokes.lib.cart import SelectedDisksDialog
from pyanaconda.ui.gui.categories.storage import StorageCategory
from pyanaconda.ui.gui.utils import enlightbox, gdk_threaded
-from pyanaconda.storage import doKickstartStorage
+from pyanaconda.kickstart import doKickstartStorage
from pyanaconda.storage.size import Size
from pyanaconda.product import productName
from pyanaconda.flags import flags
@@ -317,7 +317,8 @@ class StorageSpoke(NormalSpoke, StorageChecker):
self.data.bootloader.bootDrive = self.storage.bootloader.disks[0].name
def execute(self):
- doKickstartStorage(self.storage, self.data, self.instclass, self)
+ doKickstartStorage(self.storage, self.data, self.instclass)
+ self.run()
@property
def completed(self):
--
1.7.7.6
More information about the anaconda-patches
mailing list