remove old FSEDIT nonesense, first try at autopartitioning for workstation class

3 files changed, 29 insertions, 3 deletions

diff --git a/installclasses/custom.py b/installclasses/custom.py
index 9691cc688..bd79c2c5d 100644
--- a/installclasses/custom.py
+++ b/installclasses/custom.py
@@ -1,5 +1,4 @@
 from installclass import BaseInstallClass
-from installclass import FSEDIT_CLEAR_LINUX
 from translate import N_
 import os
 import iutil
diff --git a/installclasses/server.py b/installclasses/server.py
index c0411fe7f..2d79019f5 100644
--- a/installclasses/server.py
+++ b/installclasses/server.py
@@ -1,6 +1,5 @@
 from installclass import BaseInstallClass
 from translate import *
-from installclass import FSEDIT_CLEAR_ALL
 import os
 import iutil
 
diff --git a/installclasses/workstation.py b/installclasses/workstation.py
index 92b6fda5c..fdfc15384 100644
--- a/installclasses/workstation.py
+++ b/installclasses/workstation.py
@@ -1,8 +1,11 @@
 from installclass import BaseInstallClass
-from installclass import FSEDIT_CLEAR_LINUX
 from translate import N_
 import os
 import iutil
+from partitioning import *
+from autopart import CLEARPART_TYPE_LINUX
+from autopart import CLEARPART_TYPE_ALL
+from autopart import CLEARPART_TYPE_NONE
 
 class InstallClass(BaseInstallClass):
     name = N_("Workstation")
@@ -27,6 +30,31 @@ class InstallClass(BaseInstallClass):
 	BaseInstallClass.setInstallData(self, id)
 	self.setHostname(id, "localhost.localdomain")
 
+        rootrequest = PartitionSpec(fileSystemTypeGet("ext2"),
+                                    mountpoint = "/",
+                                    size = 800,
+                                    grow = 1,
+                                    requesttype = REQUEST_NEW,
+                                    format = 1)
+
+        bootrequest = PartitionSpec(fileSystemTypeGet("ext2"),
+                                    mountpoint = "/boot",
+                                    size = 100,
+                                    grow = 0,
+                                    requesttype = REQUEST_NEW,
+                                    format = 1)
+
+        swaprequest = PartitionSpec(fileSystemTypeGet("swap"),
+                                    size = 128,
+                                    grow = 0,
+                                    requesttype = REQUEST_NEW,
+                                    format = 1)
+
+        id.autoClearPartType = CLEARPART_TYPE_LINUX
+        id.autoClearPartDrives = []
+        id.autoPartitionRequests = [rootrequest, bootrequest, swaprequest]
+
+
     def __init__(self, expert):
 	BaseInstallClass.__init__(self, expert)