--- anaconda-11.1.2.168/installclasses/rhel.py	2008-12-18 04:21:19.000000000 -0600
+++ anaconda-11.1.2.113/installclasses/rhel.py	2009-01-29 08:46:00.461000000 -0600
@@ -6,6 +6,7 @@
 import os
 import iutil
 import types
+import rpmUtils.arch
 try:
     import instnum
 except ImportError:
@@ -17,45 +18,57 @@
 # custom installs are easy :-)
 class InstallClass(BaseInstallClass):
     # name has underscore used for mnemonics, strip if you dont need it
-    id = "rhel"
-    name = N_("Red Hat Enterprise Linux")
-    _description = N_("The default installation of %s includes a set of "
+    id = "sl"
+    name = N_("Scientific Linux")
+    description = N_("The default installation of %s includes a set of "
                      "software applicable for general internet usage. "
                      "What additional tasks would you like your system "
-                     "to include support for?")
-    _descriptionFields = (productName,)
+                     "to include support for?") %(productName,)
     sortPriority = 10000
-    allowExtraRepos = False
+    allowExtraRepos = True
+    repos = { "Scientific Linux Security Updates": ("ftp://ftp.scientificlinux.org/linux/scientific/5rolling/%s/updates/security" %(rpmUtils.arch.getBaseArch() ,), None) }
     if 0: # not productName.startswith("Red Hat Enterprise"):
         hidden = 1
 
-    taskMap = {'client'        : [(N_("Office"), ["office"]),
-                                  (N_("Multimedia"), ["graphics", 
-                                                      "sound-and-video"])],
-               'server'        : [(N_("Software Development"), 
-                                   ["development-libs", "development-tools",
-                                    "gnome-software-development", 
-                                    "x-software-development"],),
-                                  (N_("Web server"), ["web-server"])],
-               'workstation'   : [(N_("Software Development"), 
-                                   ["development-libs", "development-tools",
-                                    "gnome-software-development", 
-                                    "x-software-development"],)],
-               'vt'            : [(N_("Virtualization"), ["virtualization"])],
-               'cluster'       : [(N_("Clustering"), ["clustering"])],
-               'clusterstorage': [(N_("Storage Clustering"), 
-                                   ["cluster-storage"])]
+#    tasks = [(N_("Desktop - Gnome "), ["gnome-desktop"]),
+#             (N_("Desktop - KDE "), ["kde-desktop"]),
+#             (N_("Server "), ["server-cfg", "dns-server", "web-server", "ftp-server", "smb-server", "mail-server", "network-server", "legacy-network-server", "news-server"]),
+#             (N_("Server - GUI "), ["server-cfg", "dns-server", "web-server", "ftp-server", "smb-server", "mail-server", "network-server", "legacy-network-server", "news-server", "base-x", "ice-desktop", "admin-tools"]),
+#	     (N_("Software Development"), ["development-libs", "development-tools", "gnome-software-development", "x-software-development"],),
+#	     (N_("Office and Productivity"), ["graphics", "office", "games", "sound-and-video"]),
+#             (N_("Virtualization"), ["virtualization"]),
+#             (N_("Clustering"), ["clustering"]),
+#             (N_("Storage Clustering"), ["cluster-storage"]) ]
+
+    taskMap = {'contrib': [(N_("Contrib Area"), 
+                                   ["contrib"])],
+               'sites/fermi': [(N_("Fermilab Site Area"), 
+                                   ["fermi"])],
+               'sl'        : [(N_("GNOME Desktop"), ["graphics", "office", "games", "sound-and-video","base-x","gnome-desktop","graphical-internet","printing"],),
+                                   (N_("KDE Desktop"), ["graphics", "office", "games", "sound-and-video","base-x","kde-desktop","graphical-internet","printing"],),
+                                   (N_("Server "), ["server-cfg", "dns-server", "web-server", "ftp-server", "smb-server", "mail-server", "network-server", "legacy-network-server", "news-server"]),
+                                   (N_("Server - GUI "), ["server-cfg", "dns-server", "web-server", "ftp-server", "smb-server", "mail-server", "network-server", "legacy-network-server", "news-server", "base-x", "gnome-desktop", "admin-tools"]),
+                                   (N_("Office and Productivity"), ["graphics", "office", "games", "sound-and-video"]),
+                                   (N_("Software Development"), ["development-libs", "development-tools", "gnome-software-development", "x-software-development"],),
+                                   (N_("Virtualization"), ["virtualization"]),
+                                   (N_("Clustering"), ["clustering"]),
+                                   (N_("Cluster Storage"), ["cluster-storage"],)]
              }
 
     instkeyname = N_("Installation Number")
-    instkeydesc = N_("Would you like to enter an Installation Number "
-                     "(sometimes called Subscription Number) now? This feature "
-                     "enables the installer to access any extra components "
-                     "included with your subscription.  If you skip this step, "
-                     "additional components can be installed manually later.\n\n"
-                     "See http://www.redhat.com/InstNum/ for more information.")
-    skipkeytext = N_("If you cannot locate the Installation Number, consult "
-                     "http://www.redhat.com/InstNum/")
+    instkeydesc = N_("To install the full set of supported packages included "
+                    "in your subscription, please enter your Installation "
+                    "Number")
+    skipkeytext = N_("If you're unable to locate the Installation Number, "
+                    "consult http://www.redhat.com/apps/support/in.html.\n\n"
+                    "If you skip:\n"
+                    "* You may not get access to the full set of "
+                    "packages included in your subscription.\n"
+                    "* It may result in an unsupported/uncertified "
+                    "installation of Red Hat Enterprise Linux.\n"
+                    "* You will not get software and security updates "
+                    "for packages not included in your subscription.")
+ 
 
     def setInstallData(self, anaconda):
 	BaseInstallClass.setInstallData(self, anaconda)
@@ -65,11 +78,15 @@
     def setGroupSelection(self, anaconda):
         grps = anaconda.backend.getDefaultGroups(anaconda)
         map(lambda x: anaconda.backend.selectGroup(x), grps)
+        coregrps = ["core", "base", "dialup", "text-internet"]
+        map(lambda x: anaconda.backend.selectGroup(x), coregrps)
+        desktopgrps = ["editors", "graphics", "office", "games", "sound-and-video","base-x","gnome-desktop","graphical-internet","printing"]
+        map(lambda x: anaconda.backend.selectGroup(x), desktopgrps)
 
     def setSteps(self, dispatch):
 	BaseInstallClass.setSteps(self, dispatch);
 	dispatch.skipStep("partition")
-	dispatch.skipStep("regkey", skip = 0)        
+	dispatch.skipStep("regkey", skip = 1)        
 
     # for rhel, we're putting the metadata under productpath
     def getPackagePaths(self, uri):