diff options
| author | David Cantrell <dcantrell@redhat.com> | 2006-12-13 20:52:19 +0000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2006-12-13 20:52:19 +0000 |
| commit | 9756654625f088ae908c4d198cba1b6301199ee5 (patch) | |
| tree | 771a140a4cf5ad1b0de6c38408a0841196c08bdb /kickstart.py | |
| parent | a45acd9e9a0a1cd4ed49b9fb1c6bb0bce4118429 (diff) | |
| download | anaconda-9756654625f088ae908c4d198cba1b6301199ee5.tar.gz anaconda-9756654625f088ae908c4d198cba1b6301199ee5.tar.xz anaconda-9756654625f088ae908c4d198cba1b6301199ee5.zip | |
* anaconda (__main__): Pass reference to anaconda object to InstallData.
* fsset.py (readFstab): Take reference to anaconda object rather than
a path and intf. Pass anaconda reference to DiskSet().
* fssey.py (__main__): Removed.
* installclass.py (BaseInstallClass): Pass anaconda reference to the
reset() method for InstallData.
* instdata.py (InstallData.reset): Take anaconda object reference as
parameter. Pass anaconda to DiskSet().
* instdata.py (InstallData.__init__): Take anaconda object ref as
parameter, pass it to reset() method.
* kickstart.py (AnacondaKSHandlers): Store anaconda object reference,
pass to DiskSet() object creations.
* partedUtils.py (DiskSet): Take anaconda object reference, store. Use
self.anaconda throughout DiskSet object, remove individual pass-ins
of intf and other anaconda object parts.
* partedUtils.py (DiskSet.dastFmt): Remove -P dasdfmt(8) arg (#218861).
* partedUtils.py (DiskSet.openDevices): Remove intf, initAll, zeroMbr,
and clearDevs params since those are in the anaconda object. When a
kickstart install is running, the dasd found is in the clearpart list,
and the --initlabel option has been used, skip the interactive dialog
asking if you want to format the DASD and just do it (#218861).
* partitioning.py (partitionObjectsInitialize): Removed arguments since
the anaconda object provides those now.
* upgrade.py (mountRootPartition): Pass anaconda object ref to DiskSet.
Only pass anaconda ref to readFstab().
* upgrade.py (upgradeMountFilesystems): Likewise.
Diffstat (limited to 'kickstart.py')
| -rw-r--r-- | kickstart.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/kickstart.py b/kickstart.py index 1e590438e..6646f8a1e 100644 --- a/kickstart.py +++ b/kickstart.py @@ -97,7 +97,8 @@ class AnacondaKSHandlers(KickstartHandlers): # XXX hack to give us a starting point for RAID, LVM, etc unique IDs. self.ksID = 100000 - self.id = anaconda.id + self.anaconda = anaconda + self.id = self.anaconda.id self.lineno = 0 self.currentCmd = "" @@ -308,7 +309,7 @@ class AnacondaKSHandlers(KickstartHandlers): KickstartHandlers.doMultiPath(self, args) from partedUtils import DiskSet - ds = DiskSet() + ds = DiskSet(self.anaconda) ds.startMPath() mpath = self.ksdata.mpaths[-1] @@ -334,7 +335,7 @@ class AnacondaKSHandlers(KickstartHandlers): KickstartHandlers.doDmRaid(self, args) from partedUtils import DiskSet - ds = DiskSet() + ds = DiskSet(self.anaconda) ds.startDmRaid() raid = self.ksdata.dmraids[-1] @@ -781,12 +782,13 @@ class Kickstart(cobject): def setInstallData (self, anaconda): BaseInstallClass.setInstallData(self, anaconda) self.setEarlySwapOn(1) - self.id = anaconda.id + self.anaconda = anaconda + self.id = self.anaconda.id self.id.firstboot = FIRSTBOOT_SKIP # make sure our disks are alive from partedUtils import DiskSet - ds = DiskSet() + ds = DiskSet(self.anaconda) ds.startMPath() ds.startDmRaid() |