(drmike) fstab.py,iw/rootpartition.py,textw/partitioning.py: Attempt to fix bug where if you autopartition, then back up and try to manually partition, the fstab entries from the autopartition attempt polluted the disk druid partition spec inproperly. Now we test and attempt to clear out fstab entries from autopartition attempt before running disk druid

1 files changed, 7 insertions, 4 deletions

diff --git a/fstab.py b/fstab.py
index 4eca965ea..1293e6f42 100644
--- a/fstab.py
+++ b/fstab.py
@@ -123,9 +123,9 @@ class Fstab:
 		fsystem = "ext2"
 	    self.addNewRaidDevice(mntPoint, raidDev, fsystem, level, devices)
 	    
-    def rescanPartitions(self):
+    def rescanPartitions(self, clearFstabCache = 0):
 	if self.ddruid:
-	    self.closeDrives()
+	    self.closeDrives(clearFstabCache)
 
         fstab = []
 	for (mntpoint, dev, fstype, reformat, size) in self.cachedFstab:
@@ -135,9 +135,12 @@ class Fstab:
 				  self.readOnly)
 	del self.cachedFstab
 
-    def closeDrives(self):
+    def closeDrives(self, clearFstabCache = 0):
 	# we expect a rescanPartitions() after this!!!
-	self.cachedFstab = self.mountList(skipExtra = 1)
+        if clearFstabCache:
+            self.cachedFstab = []
+        else:
+	    self.cachedFstab = self.mountList(skipExtra = 1)
 	self.ddruid = None
 
     def setReadonly(self, readOnly):