new installclass changes

4 files changed, 70 insertions, 67 deletions

diff --git a/installclasses/developer_workstation.py b/installclasses/developer_workstation.py
deleted file mode 100644
index 71cba0279..000000000
--- a/installclasses/developer_workstation.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import workstation
-from rhpl.translate import N_
-import os
-
-class InstallClass(workstation.InstallClass):
-    name = N_("Developer Workstation")
-    pixmap = "workstation.png"
-    description = N_("Select this "
-		     "installation type to install a graphical desktop "
-		     "environment which includes tools for software "
-		     "development.")
-
-    sortPriority = 2
-
-    def setGroupSelection(self, comps):
-        workstation.InstallClass.setGroupSelection(self, comps)
-        comps["Emacs"].select()
-        comps["GNOME Software Development"].select()
-	comps["X Software Development"].select()
-        comps["Development Tools"].select()
-
-    def __init__(self, expert):
-	workstation.InstallClass.__init__(self, expert)
diff --git a/installclasses/personal_desktop.py b/installclasses/personal_desktop.py
new file mode 100644
index 000000000..7a8be7b6e
--- /dev/null
+++ b/installclasses/personal_desktop.py
@@ -0,0 +1,53 @@
+from installclass import BaseInstallClass
+from rhpl.translate import N_
+from constants import *
+import os
+import iutil
+from autopart import getAutopartitionBoot, autoCreatePartitionRequests
+from fsset import *
+
+class InstallClass(BaseInstallClass):
+    name = N_("Personal Desktop")
+    pixmap = "workstation.png"
+    description = N_("Perfect for peronal computers or laptops, select this "
+		     "installation type to install a graphical desktop "
+		     "environment and create a system ideal for home "
+		     "or desktop use.")
+
+    sortPriority = 1
+
+    def setSteps(self, dispatch):
+	BaseInstallClass.setSteps(self, dispatch);
+	dispatch.skipStep("partition")
+	dispatch.skipStep("authentication")
+
+        dispatch.skipStep("desktopchoice", skip = 0)
+        dispatch.skipStep("package-selection", skip = 1)
+
+    def setGroupSelection(self, comps):
+	BaseInstallClass.__init__(self, comps)
+
+        for comp in comps.comps:
+            comp.unselect()
+
+        comps["Workstation Common"].includeMembers()
+        comps["GNOME Desktop Environment"].select()
+
+    def setInstallData(self, id):
+	BaseInstallClass.setInstallData(self, id)
+
+        autorequests = [ ("/", None, 1100, None, 1, 1) ]
+
+        bootreq = getAutopartitionBoot()
+        if bootreq:
+            autorequests.append(bootreq)
+
+        (minswap, maxswap) = iutil.swapSuggestion()
+        autorequests.append((None, "swap", minswap, maxswap, 1, 1))
+
+        id.partitions.autoClearPartType = CLEARPART_TYPE_LINUX
+        id.partitions.autoClearPartDrives = None
+        id.partitions.autoPartitionRequests = autoCreatePartitionRequests(autorequests)
+
+    def __init__(self, expert):
+	BaseInstallClass.__init__(self, expert)
diff --git a/installclasses/server.py b/installclasses/server.py
index 263d26944..20c30fbb2 100644
--- a/installclasses/server.py
+++ b/installclasses/server.py
@@ -11,7 +11,9 @@ class InstallClass(BaseInstallClass):
     pixmap = "server.png"
     description = N_("Select this installation type if you would like to "
 		     "set up file sharing, print sharing, and Web services. "
-		     "Additional services can also be enabled.")
+		     "Additional services can also be enabled, and you "
+		     "can choose whether or not to install a graphical "
+		     "environment.")
     
     sortPriority = 10
 
diff --git a/installclasses/workstation.py b/installclasses/workstation.py
index 06a3fd35c..8f51d318d 100644
--- a/installclasses/workstation.py
+++ b/installclasses/workstation.py
@@ -1,53 +1,24 @@
-from installclass import BaseInstallClass
+import personal_desktop
 from rhpl.translate import N_
-from constants import *
 import os
-import iutil
-from autopart import getAutopartitionBoot, autoCreatePartitionRequests
-from fsset import *
 
-class InstallClass(BaseInstallClass):
-    name = N_("Personal Workstation")
+class InstallClass(personal_desktop.InstallClass):
+    name = N_("Workstation")
     pixmap = "workstation.png"
-    description = N_("Perfect for workstations or laptops, select this "
-		     "installation type to install a graphical desktop "
-		     "environment and create a system ideal for home "
-		     "or desktop use.")
+    description = N_("This option installs a graphical desktop "
+		     "environment with tools for software "
+		     "development and system adminstration."
+		     "A good choice for programmers and system administrators.")
 
-    sortPriority = 1
 
-    def setSteps(self, dispatch):
-	BaseInstallClass.setSteps(self, dispatch);
-	dispatch.skipStep("partition")
-	dispatch.skipStep("authentication")
-
-        dispatch.skipStep("desktopchoice", skip = 0)
-        dispatch.skipStep("package-selection", skip = 1)
+    sortPriority = 2
 
     def setGroupSelection(self, comps):
-	BaseInstallClass.__init__(self, comps)
-
-        for comp in comps.comps:
-            comp.unselect()
-
-        comps["Workstation Common"].includeMembers()
-        comps["GNOME Desktop Environment"].select()
-
-    def setInstallData(self, id):
-	BaseInstallClass.setInstallData(self, id)
-
-        autorequests = [ ("/", None, 1100, None, 1, 1) ]
-
-        bootreq = getAutopartitionBoot()
-        if bootreq:
-            autorequests.append(bootreq)
-
-        (minswap, maxswap) = iutil.swapSuggestion()
-        autorequests.append((None, "swap", minswap, maxswap, 1, 1))
-
-        id.partitions.autoClearPartType = CLEARPART_TYPE_LINUX
-        id.partitions.autoClearPartDrives = None
-        id.partitions.autoPartitionRequests = autoCreatePartitionRequests(autorequests)
+        personal_desktop.InstallClass.setGroupSelection(self, comps)
+        comps["Emacs"].select()
+        comps["GNOME Software Development"].select()
+	comps["X Software Development"].select()
+        comps["Development Tools"].select()
 
     def __init__(self, expert):
-	BaseInstallClass.__init__(self, expert)
+	personal_desktop.InstallClass.__init__(self, expert)