diff -uNr anaconda-11.1.2.36__orig/installclasses/rhel.py anaconda-11.1.2.36/installclasses/rhel.py --- anaconda-11.1.2.36__orig/installclasses/rhel.py 2007-01-15 18:56:46.000000000 +0000 +++ anaconda-11.1.2.36/installclasses/rhel.py 2007-03-29 21:45:50.000000000 +0000 @@ -17,14 +17,14 @@ # custom installs are easy :-) 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 includes a set of " "software applicable for general internet usage. " "What additional tasks would you like your system " "to include support for?") %(productName,) sortPriority = 10000 - allowExtraRepos = False + allowExtraRepos = True if 0: # not productName.startswith("Red Hat Enterprise"): hidden = 1 @@ -48,16 +48,8 @@ instkeyname = N_("Installation Number") instkeydesc = N_("To install the full set of supported packages included " - "in your subscription, please enter your Installation " "Number") skipkeytext = N_("If you're unable to locate the Installation Number, " - "consult http://www.redhat.com/apps/support/in.html.\n\n" - "If you skip:\n" - "* You may not get access to the full set of " - "packages included in your subscription.\n" - "* It may result in an unsupported/uncertified " - "installation of Red Hat Enterprise Linux.\n" - "* You will not get software and security updates " "for packages not included in your subscription.") @@ -75,25 +67,6 @@ dispatch.skipStep("partition") dispatch.skipStep("regkey", skip = 0) - # for rhel, we're putting the metadata under productpath - def getPackagePaths(self, uri): - rc = {} - for (name, path) in self.repopaths.items(): - if not type(uri) == types.ListType: - uri = [uri,] - if not type(path) == types.ListType: - path = [path,] - - lst = [] - for i in uri: - for p in path: - lst.append("%s/%s" % (i, p)) - - rc[name] = lst - - log.info("package paths is %s" %(rc,)) - return rc - def handleRegKey(self, key, intf, interactive = True): self.repopaths = { "base": "%s" %(productPath,) } self.tasks = self.taskMap[productPath.lower()]