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 /instdata.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 'instdata.py')
| -rw-r--r-- | instdata.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/instdata.py b/instdata.py index 39f79eb8a..af26c4fe9 100644 --- a/instdata.py +++ b/instdata.py @@ -44,7 +44,7 @@ log = logging.getLogger("anaconda") class InstallData: - def reset(self): + def reset(self, anaconda): # Reset everything except: # # - The mouse @@ -65,7 +65,7 @@ class InstallData: self.upgrade = None # XXX move fsset and/or diskset into Partitions object? self.fsset.reset() - self.diskset = partedUtils.DiskSet() + self.diskset = partedUtils.DiskSet(anaconda) self.partitions = partitions.Partitions() self.bootloader = bootloader.getBootloader() self.dependencies = [] @@ -257,7 +257,7 @@ class InstallData: os.chmod(filename, 0600) - def __init__(self, extraModules, floppyDevice, methodstr, displayMode, backend = None): + def __init__(self, anaconda, extraModules, floppyDevice, methodstr, displayMode, backend = None): self.displayMode = displayMode self.instLanguage = language.Language(self.displayMode) @@ -278,4 +278,4 @@ class InstallData: self.excludeDocs = 1 self.methodstr = methodstr - self.reset() + self.reset(anaconda) |