1 |
slords |
1.1 |
diff -uNr anaconda-11.1.2.36__orig/installclasses/rhel.py anaconda-11.1.2.36/installclasses/rhel.py |
2 |
|
|
--- anaconda-11.1.2.36__orig/installclasses/rhel.py 2007-01-15 18:56:46.000000000 +0000 |
3 |
|
|
+++ anaconda-11.1.2.36/installclasses/rhel.py 2007-03-29 21:45:50.000000000 +0000 |
4 |
|
|
@@ -17,14 +17,14 @@ |
5 |
|
|
# custom installs are easy :-) |
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 includes a set of " |
13 |
|
|
"software applicable for general internet usage. " |
14 |
|
|
"What additional tasks would you like your system " |
15 |
|
|
"to include support for?") %(productName,) |
16 |
|
|
sortPriority = 10000 |
17 |
|
|
- allowExtraRepos = False |
18 |
|
|
+ allowExtraRepos = True |
19 |
|
|
if 0: # not productName.startswith("Red Hat Enterprise"): |
20 |
|
|
hidden = 1 |
21 |
|
|
|
22 |
|
|
@@ -48,16 +48,8 @@ |
23 |
|
|
|
24 |
|
|
instkeyname = N_("Installation Number") |
25 |
|
|
instkeydesc = N_("To install the full set of supported packages included " |
26 |
|
|
- "in your subscription, please enter your Installation " |
27 |
|
|
"Number") |
28 |
|
|
skipkeytext = N_("If you're unable to locate the Installation Number, " |
29 |
|
|
- "consult http://www.redhat.com/apps/support/in.html.\n\n" |
30 |
|
|
- "If you skip:\n" |
31 |
|
|
- "* You may not get access to the full set of " |
32 |
|
|
- "packages included in your subscription.\n" |
33 |
|
|
- "* It may result in an unsupported/uncertified " |
34 |
|
|
- "installation of Red Hat Enterprise Linux.\n" |
35 |
|
|
- "* You will not get software and security updates " |
36 |
|
|
"for packages not included in your subscription.") |
37 |
|
|
|
38 |
|
|
|
39 |
|
|
@@ -75,25 +67,6 @@ |
40 |
|
|
dispatch.skipStep("partition") |
41 |
|
|
dispatch.skipStep("regkey", skip = 0) |
42 |
|
|
|
43 |
|
|
- # for rhel, we're putting the metadata under productpath |
44 |
|
|
- def getPackagePaths(self, uri): |
45 |
|
|
- rc = {} |
46 |
|
|
- for (name, path) in self.repopaths.items(): |
47 |
|
|
- if not type(uri) == types.ListType: |
48 |
|
|
- uri = [uri,] |
49 |
|
|
- if not type(path) == types.ListType: |
50 |
|
|
- path = [path,] |
51 |
|
|
- |
52 |
|
|
- lst = [] |
53 |
|
|
- for i in uri: |
54 |
|
|
- for p in path: |
55 |
|
|
- lst.append("%s/%s" % (i, p)) |
56 |
|
|
- |
57 |
|
|
- rc[name] = lst |
58 |
|
|
- |
59 |
|
|
- log.info("package paths is %s" %(rc,)) |
60 |
|
|
- return rc |
61 |
|
|
- |
62 |
|
|
def handleRegKey(self, key, intf, interactive = True): |
63 |
|
|
self.repopaths = { "base": "%s" %(productPath,) } |
64 |
|
|
self.tasks = self.taskMap[productPath.lower()] |