* 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.

1 files changed, 4 insertions, 25 deletions

diff --git a/fsset.py b/fsset.py
index dbcc4d41a..d2a3d7e17 100644
--- a/fsset.py
+++ b/fsset.py
@@ -2465,13 +2465,15 @@ def makeDevice(dev):
     return device
 
 # XXX fix RAID
-def readFstab (path, intf = None):
+def readFstab (anaconda):
+    path = anaconda.rootPath + '/etc/fstab'
+    intf = anaconda.intf
     fsset = FileSystemSet()
 
     # first, we look at all the disks on the systems and get any ext2/3
     # labels off of the filesystem.
     # temporary, to get the labels
-    diskset = partedUtils.DiskSet()
+    diskset = partedUtils.DiskSet(anaconda)
     diskset.openDevices()
     labels = diskset.getLabels()
 
@@ -2850,26 +2852,3 @@ def getDiskPart(dev):
         partNum = None
 
     return (name, partNum)
-
-
-if __name__ == "__main__":
-    fsset = readFstab("fstab")
-
-    print fsset.fstab()
-    
-    sys.exit(0)
-    fsset = FileSystemSet()
-    proc = FileSystemSetEntry(Device(), '/proc', 'proc')
-    fsset.add(proc)
-    devpts = FileSystemSetEntry(Device(), '/dev/pts', 'devpts')
-    fsset.add(devpts)
-
-    device = LoopbackDevice("hda1", "vfat")
-    mountpoint = FileSystemSetEntry (device, '/')
-    fsset.add(mountpoint)
-
-    device = SwapFileDevice("/SWAP")
-    mountpoint = FileSystemSetEntry (device, "swap", "swap")
-    fsset.add(mountpoint)
-    
-    print fsset.fstab()