1 |
slords |
1.2 |
diff -uNr anaconda-11.1.2.87__orig/installclasses/rhel.py anaconda-11.1.2.87/installclasses/rhel.py |
2 |
|
|
--- anaconda-11.1.2.87__orig/installclasses/rhel.py 2007-07-12 20:35:46.000000000 +0100 |
3 |
|
|
+++ anaconda-11.1.2.87/installclasses/rhel.py 2007-11-14 01:08:34.000000000 +0000 |
4 |
|
|
@@ -17,15 +17,15 @@ |
5 |
slords |
1.1 |
# 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 |
slords |
1.2 |
_description = N_("The default installation of %s includes a set of " |
13 |
slords |
1.1 |
"software applicable for general internet usage. " |
14 |
|
|
"What additional tasks would you like your system " |
15 |
slords |
1.2 |
"to include support for?") |
16 |
|
|
_descriptionFields = (productName,) |
17 |
slords |
1.1 |
sortPriority = 10000 |
18 |
|
|
- allowExtraRepos = False |
19 |
|
|
+ allowExtraRepos = True |
20 |
|
|
if 0: # not productName.startswith("Red Hat Enterprise"): |
21 |
|
|
hidden = 1 |
22 |
|
|
|
23 |
slords |
1.2 |
diff -uNr anaconda-11.1.2.87__orig/installclasses/rhel.py anaconda-11.1.2.87/installclasses/rhel.py |
24 |
|
|
--- anaconda-11.1.2.87__orig/installclasses/rhel.py 2007-11-14 01:13:08.000000000 +0000 |
25 |
|
|
+++ anaconda-11.1.2.87/installclasses/rhel.py 2007-11-14 01:20:52.000000000 +0000 |
26 |
|
|
@@ -75,25 +75,6 @@ |
27 |
slords |
1.1 |
dispatch.skipStep("partition") |
28 |
|
|
dispatch.skipStep("regkey", skip = 0) |
29 |
|
|
|
30 |
|
|
- # for rhel, we're putting the metadata under productpath |
31 |
|
|
- def getPackagePaths(self, uri): |
32 |
|
|
- rc = {} |
33 |
|
|
- for (name, path) in self.repopaths.items(): |
34 |
|
|
- if not type(uri) == types.ListType: |
35 |
|
|
- uri = [uri,] |
36 |
|
|
- if not type(path) == types.ListType: |
37 |
|
|
- path = [path,] |
38 |
|
|
- |
39 |
|
|
- lst = [] |
40 |
|
|
- for i in uri: |
41 |
|
|
- for p in path: |
42 |
|
|
- lst.append("%s/%s" % (i, p)) |
43 |
|
|
- |
44 |
|
|
- rc[name] = lst |
45 |
|
|
- |
46 |
|
|
- log.info("package paths is %s" %(rc,)) |
47 |
|
|
- return rc |
48 |
|
|
- |
49 |
|
|
def handleRegKey(self, key, intf, interactive = True): |
50 |
|
|
self.repopaths = { "base": "%s" %(productPath,) } |
51 |
|
|
self.tasks = self.taskMap[productPath.lower()] |