| 1 |
diff -uNrp anaconda-13.21.239.orig/installclasses/rhel.py anaconda-13.21.239/installclasses/rhel.py |
| 2 |
--- anaconda-13.21.239.orig/installclasses/rhel.py 2015-03-24 15:18:45.000000000 +0000 |
| 3 |
+++ anaconda-13.21.239/installclasses/rhel.py 2015-07-24 14:34:21.827447613 +0000 |
| 4 |
@@ -29,20 +29,78 @@ import yuminstall |
| 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 @@ class InstallClass(BaseInstallClass): |
| 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 @@ class InstallClass(BaseInstallClass): |
| 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... |
Parent Directory
| 
Revision Log
| 
Revision Graph
