| 1 |
diff -uNr anaconda-11.1.2.209__orig/installclasses/rhel.py anaconda-11.1.2.209/installclasses/rhel.py |
| 2 |
--- anaconda-11.1.2.209__orig/installclasses/rhel.py 2010-04-25 04:00:52.293535000 +0000 |
| 3 |
+++ anaconda-11.1.2.209/installclasses/rhel.py 2010-04-25 04:04:25.643535894 +0000 |
| 4 |
@@ -29,23 +29,13 @@ |
| 5 |
if 0: # not productName.startswith("Red Hat Enterprise"): |
| 6 |
hidden = 1 |
| 7 |
|
| 8 |
- taskMap = {'client' : [(N_("Office"), ["office"]), |
| 9 |
- (N_("Multimedia"), ["graphics", |
| 10 |
- "sound-and-video"])], |
| 11 |
- 'server' : [(N_("Software Development"), |
| 12 |
- ["development-libs", "development-tools", |
| 13 |
- "gnome-software-development", |
| 14 |
- "x-software-development"],), |
| 15 |
- (N_("Web server"), ["web-server"])], |
| 16 |
- 'workstation' : [(N_("Software Development"), |
| 17 |
- ["development-libs", "development-tools", |
| 18 |
- "gnome-software-development", |
| 19 |
- "x-software-development"],)], |
| 20 |
- 'vt' : [(N_("Virtualization"), ["xen"])], |
| 21 |
- 'cluster' : [(N_("Clustering"), ["clustering"])], |
| 22 |
- 'clusterstorage': [(N_("Storage Clustering"), |
| 23 |
- ["cluster-storage"])] |
| 24 |
- } |
| 25 |
+ tasks = [(N_("Desktop - Gnome "), ["graphics", "office", "games", "sound-and-video","base-x","gnome-desktop","graphical-internet","printing"]), |
| 26 |
+ (N_("Desktop - KDE "), ["graphics", "office", "games", "sound-and-video","base-x","kde-desktop","graphical-internet","printing"]), |
| 27 |
+ (N_("Server "), ["server-cfg", "dns-server", "web-server", "ftp-server", "smb-server", "mail-server", "network-server", "legacy-network-server", "news-server"]), |
| 28 |
+ (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"]), |
| 29 |
+ (N_("Virtualization"), ["virtualization"]), |
| 30 |
+ (N_("Clustering"), ["clustering"]), |
| 31 |
+ (N_("Storage Clustering"), ["cluster-storage"]) ] |
| 32 |
|
| 33 |
instkeyname = N_("Installation Number") |
| 34 |
instkeydesc = N_("Would you like to enter an Installation Number " |
| 35 |
@@ -65,6 +55,11 @@ |
| 36 |
def setGroupSelection(self, anaconda): |
| 37 |
grps = anaconda.backend.getDefaultGroups(anaconda) |
| 38 |
map(lambda x: anaconda.backend.selectGroup(x), grps) |
| 39 |
+ coregrps = ["core", "base", "dialup", "text-internet"] |
| 40 |
+ map(lambda x: anaconda.backend.selectGroup(x), coregrps) |
| 41 |
+ desktopgrps = ["editors", "graphics", "office", "games", "sound-and-video","base-x","gnome-desktop","graphical-internet","printing"] |
| 42 |
+ map(lambda x: anaconda.backend.selectGroup(x), desktopgrps) |
| 43 |
+ |
| 44 |
|
| 45 |
def setSteps(self, dispatch): |
| 46 |
BaseInstallClass.setSteps(self, dispatch); |
| 47 |
@@ -136,5 +131,5 @@ |
| 48 |
self.repopaths = { "base": "%s" %(productPath,) } |
| 49 |
|
| 50 |
# minimally set up tasks in case no key is provided |
| 51 |
- self.tasks = self.taskMap[productPath.lower()] |
| 52 |
+ # self.tasks = self.taskMap[productPath.lower()] |
| 53 |
|
Parent Directory
| 
Revision Log
| 
Revision Graph
