anaconda/sme9/anaconda-centos-installclass.patch

diff -uNr anaconda-13.21.195__orig/installclasses/rhel.py anaconda-13.21.195/installclasses/rhel.py
--- anaconda-13.21.195__orig/installclasses/rhel.py     2012-11-26 20:42:02.000000000 +0000
+++ anaconda-13.21.195/installclasses/rhel.py   2013-03-01 23:02:13.665813204 +0000
@@ -29,20 +29,78 @@
 
 class InstallClass(BaseInstallClass):
     # name has underscore used for mnemonics, strip if you dont need it
-    id = "rhel"
-    name = N_("Red Hat Enterprise Linux")
+    id = "centos"
+    name = N_("CentOS Linux")
     _description = N_("The default installation of %s is a minimum install. "
                      "You can optionally select a different set of software "
                      "now.")
     _descriptionFields = (productName,)
-    sortPriority = 10000
-    hidden = 1
+    sortPriority = 10005
+    hidden = 0
 
     bootloaderTimeoutDefault = 5
     bootloaderExtraArgs = ["crashkernel=auto"]
 
-    tasks = [(N_("Minimal"),
-              ["core"])]
+    tasks = [(N_("Desktop"),
+              ["base", "core", "debugging",
+               "directory-client", "java-platform", "network-file-system-client",
+               "server-platform",
+               "fonts", "print-client",
+               "basic-desktop", "desktop-debugging", "desktop-platform",
+               "general-desktop", "graphical-admin-tools", "input-methods",
+               "legacy-x", "x11", "internet-applications", "internet-browser", "office-suite",
+               "remote-desktop-clients"]),
+              (N_("Minimal Desktop"),
+              ["base", "core", "debugging",
+               "directory-client", "java-platform", "network-file-system-client",
+               "server-platform",
+               "fonts", "print-client",
+               "basic-desktop", "desktop-debugging", "desktop-platform",
+               "input-methods",
+               "legacy-x", "x11", "internet-browser",
+               "remote-desktop-clients"]),
+             (N_("Minimal"),
+              ["core"]),
+             (N_("Basic Server"),
+              ["base", "console-internet", "core", "debugging",
+               "directory-client", "hardware-monitoring", "java-platform", 
+               "large-systems", "network-file-system-client",
+               "performance", "perl-runtime", "server-platform"]),
+             (N_("Database Server"),
+              ["base", "console-internet", "core", "debugging",
+               "directory-client", "hardware-monitoring", "java-platform", 
+               "large-systems", "network-file-system-client",
+               "performance", "perl-runtime", "server-platform",
+               "mysql-client", "mysql", "postgresql-client", "postgresql",
+               "system-admin-tools"]),
+             (N_("Web Server"),
+              ["base", "console-internet", "core", "debugging",
+               "directory-client", "java-platform", 
+               "network-file-system-client",
+               "performance", "perl-runtime", "server-platform",
+               "web-server", "web-servlet", "php", "turbogears",
+               "mysql-client", "postgresql-client"]),
+             (N_("Virtual Host"),
+              ["base", "console-internet", "core", "debugging",
+               "directory-client", "hardware-monitoring", "java-platform", 
+               "large-systems", "network-file-system-client",
+               "performance", "perl-runtime", "server-platform",
+               "virtualization", "virtualization-client",
+               "virtualization-platform"]),
+             (N_("Software Development Workstation"),
+              ["base", "core", "debugging",
+               "directory-client", "java-platform", "network-file-system-client",
+               "performance", "perl-runtime", "server-platform",
+               "fonts", "print-client",
+               "basic-desktop", "desktop-debugging", "desktop-platform",
+               "general-desktop", "graphical-admin-tools", "input-methods",
+               "legacy-x", "x11", "internet-browser", "graphics", "emacs", "tex",
+               "remote-desktop-clients", "virtualization", "virtualization-client",
+               "virtualization-platform",
+               "desktop-platform-devel", "development", "eclipse",
+               "server-platform-devel", "technical-writing",
+               "additional-devel"])]
+ 
 
     def getPackagePaths(self, uri):
         if not type(uri) == types.ListType:
@@ -59,6 +117,7 @@
     def setSteps(self, anaconda):
         BaseInstallClass.setSteps(self, anaconda)
         anaconda.dispatch.skipStep("partition")
+        anaconda.dispatch.skipStep("betanag",permanent=1)
 
     def getBackend(self):
         if flags.livecdInstall:
@@ -75,6 +134,7 @@
             return True
 
         productUpgrades = {
+            "CentOS": ("CentOS release", ),
             "Red Hat Enterprise Linux AS": ("Red Hat Linux Advanced Server", ),
             "Red Hat Enterprise Linux WS": ("Red Hat Linux Advanced Workstation",),
             # FIXME: this probably shouldn't be in a release...
Binary files anaconda-13.21.195__orig/installclasses/.rhel.py.swp and anaconda-13.21.195/installclasses/.rhel.py.swp differ
1	diff -uNr anaconda-13.21.195__orig/installclasses/rhel.py anaconda-13.21.195/installclasses/rhel.py
2	--- anaconda-13.21.195__orig/installclasses/rhel.py 2012-11-26 20:42:02.000000000 +0000
3	+++ anaconda-13.21.195/installclasses/rhel.py 2013-03-01 23:02:13.665813204 +0000
4	@@ -29,20 +29,78 @@
5
6	class InstallClass(BaseInstallClass):
7	# name has underscore used for mnemonics, strip if you dont need it
8	- id = "rhel"
9	- name = N_("Red Hat Enterprise Linux")
10	+ id = "centos"
11	+ name = N_("CentOS Linux")
12	_description = N_("The default installation of %s is a minimum install. "
13	"You can optionally select a different set of software "
14	"now.")
15	_descriptionFields = (productName,)
16	- sortPriority = 10000
17	- hidden = 1
18	+ sortPriority = 10005
19	+ hidden = 0
20
21	bootloaderTimeoutDefault = 5
22	bootloaderExtraArgs = ["crashkernel=auto"]
23
24	- tasks = [(N_("Minimal"),
25	- ["core"])]
26	+ tasks = [(N_("Desktop"),
27	+ ["base", "core", "debugging",
28	+ "directory-client", "java-platform", "network-file-system-client",
29	+ "server-platform",
30	+ "fonts", "print-client",
31	+ "basic-desktop", "desktop-debugging", "desktop-platform",
32	+ "general-desktop", "graphical-admin-tools", "input-methods",
33	+ "legacy-x", "x11", "internet-applications", "internet-browser", "office-suite",
34	+ "remote-desktop-clients"]),
35	+ (N_("Minimal Desktop"),
36	+ ["base", "core", "debugging",
37	+ "directory-client", "java-platform", "network-file-system-client",
38	+ "server-platform",
39	+ "fonts", "print-client",
40	+ "basic-desktop", "desktop-debugging", "desktop-platform",
41	+ "input-methods",
42	+ "legacy-x", "x11", "internet-browser",
43	+ "remote-desktop-clients"]),
44	+ (N_("Minimal"),
45	+ ["core"]),
46	+ (N_("Basic Server"),
47	+ ["base", "console-internet", "core", "debugging",
48	+ "directory-client", "hardware-monitoring", "java-platform",
49	+ "large-systems", "network-file-system-client",
50	+ "performance", "perl-runtime", "server-platform"]),
51	+ (N_("Database Server"),
52	+ ["base", "console-internet", "core", "debugging",
53	+ "directory-client", "hardware-monitoring", "java-platform",
54	+ "large-systems", "network-file-system-client",
55	+ "performance", "perl-runtime", "server-platform",
56	+ "mysql-client", "mysql", "postgresql-client", "postgresql",
57	+ "system-admin-tools"]),
58	+ (N_("Web Server"),
59	+ ["base", "console-internet", "core", "debugging",
60	+ "directory-client", "java-platform",
61	+ "network-file-system-client",
62	+ "performance", "perl-runtime", "server-platform",
63	+ "web-server", "web-servlet", "php", "turbogears",
64	+ "mysql-client", "postgresql-client"]),
65	+ (N_("Virtual Host"),
66	+ ["base", "console-internet", "core", "debugging",
67	+ "directory-client", "hardware-monitoring", "java-platform",
68	+ "large-systems", "network-file-system-client",
69	+ "performance", "perl-runtime", "server-platform",
70	+ "virtualization", "virtualization-client",
71	+ "virtualization-platform"]),
72	+ (N_("Software Development Workstation"),
73	+ ["base", "core", "debugging",
74	+ "directory-client", "java-platform", "network-file-system-client",
75	+ "performance", "perl-runtime", "server-platform",
76	+ "fonts", "print-client",
77	+ "basic-desktop", "desktop-debugging", "desktop-platform",
78	+ "general-desktop", "graphical-admin-tools", "input-methods",
79	+ "legacy-x", "x11", "internet-browser", "graphics", "emacs", "tex",
80	+ "remote-desktop-clients", "virtualization", "virtualization-client",
81	+ "virtualization-platform",
82	+ "desktop-platform-devel", "development", "eclipse",
83	+ "server-platform-devel", "technical-writing",
84	+ "additional-devel"])]
85	+
86
87	def getPackagePaths(self, uri):
88	if not type(uri) == types.ListType:
89	@@ -59,6 +117,7 @@
90	def setSteps(self, anaconda):
91	BaseInstallClass.setSteps(self, anaconda)
92	anaconda.dispatch.skipStep("partition")
93	+ anaconda.dispatch.skipStep("betanag",permanent=1)
94
95	def getBackend(self):
96	if flags.livecdInstall:
97	@@ -75,6 +134,7 @@
98	return True
99
100	productUpgrades = {
101	+ "CentOS": ("CentOS release", ),
102	"Red Hat Enterprise Linux AS": ("Red Hat Linux Advanced Server", ),
103	"Red Hat Enterprise Linux WS": ("Red Hat Linux Advanced Workstation",),
104	# FIXME: this probably shouldn't be in a release...
105	Binary files anaconda-13.21.195__orig/installclasses/.rhel.py.swp and anaconda-13.21.195/installclasses/.rhel.py.swp differ