Move the partitioning bits into Partitions object. The diskset should probably

go in here at some point, and arguably the fsset as well, but that should be
able to be done without major upheaval.  Major changes to note:

* id.partitions created
* PartitionRequest object folded into Partitions
* all of the various autopartitioning variables folded into Partitions
* avoid passing just instdata as much as possible

other minor fixes which are slipping into this commit
* /usr for server install size to 800 megs... 512 is too small :(
* kickstart bootloader fix
* fix a couple places to use convenience functions instead of part.geom.disk.dev.path
* set self.intf for gui autopartitioning so message window works

1 files changed, 4 insertions, 11 deletions

diff --git a/instdata.py b/instdata.py
index 1a966084f..b76856db7 100644
--- a/instdata.py
+++ b/instdata.py
@@ -22,6 +22,7 @@ import desktop
 import users
 import fsset
 import bootloader
+import partitioning
 from flags import *
 
 from simpleconfig import SimpleConfigFile
@@ -59,21 +60,13 @@ class InstallData:
 	self.hdList = None
 	self.comps = None
 	self.upgrade = Boolean()
+        # XXX move fsset and/or diskset into Partitions object?
 	self.fsset.reset()
-#
-# delay setting these until we know the partition method        
-#        self.diskset = partitioning.DiskSet()
-#        self.partrequests = partitioning.PartitionRequests(self.diskset)
-        self.diskset = None
-        self.partrequests = None
-        self.autoPartitionRequests = []
-        self.autoClearPartType = None
-        self.autoClearPartDrives = []
+        self.diskset = partitioning.DiskSet()
+        self.partitions = partitioning.Partitions()
         self.bootloader = bootloader.getBootloader()
         self.dependencies = []
         self.dbpath = None
-        self.useFdisk = 0
-        self.useAutopartitioning = 1
         self.upgradeRoot = None
         self.upgradeSwapInfo = None