--- rpms/anaconda/sme8/anaconda-11.1.2.87-smeserver.patch 2008/03/16 18:25:42 1.5 +++ rpms/anaconda/sme8/anaconda-11.1.2.87-smeserver.patch 2008/03/18 19:44:09 1.10 @@ -172,7 +172,7 @@ - else: - devname = drive - partList.append("%s (%s)" %(desc, drive)) -+ partList.append("Upgrade existing \"%s\" system" %(desc)) ++ partList.append(_("Upgrade existing \"%s\" system") %(desc)) (button, choice) = ListboxChoiceWindow(screen, _("System to Upgrade"), - _("One or more existing Linux installations " @@ -217,40 +217,6 @@ dosync() ---- anaconda-11.1.2.87/fedorakmod.py.sme2 2007-08-07 14:45:51.000000000 -0600 -+++ anaconda-11.1.2.87/fedorakmod.py 2008-03-16 12:21:33.000000000 -0600 -@@ -27,6 +27,9 @@ - from yum.constants import TS_INSTALL - from yum.plugins import TYPE_CORE, PluginYumExit - -+import logging -+log = logging.getLogger("anaconda") -+ - requires_api_version = '2.4' - plugin_type = (TYPE_CORE,) - -@@ -118,10 +121,10 @@ - kernel = ImmutableSet(getKernelReqs(po)) - kernelReqs = kernel.intersection(kernelProvides) - if len(kernel) == 0: -- print "Bad kmod package '%s' does not require a kernel" % po -+ log.warning("Bad kmod package '%s' does not require a kernel" % po) - continue - elif len(kernelReqs) > 1: -- print "Bad kmod package: Must require only one kernel" -+ log.warning("Bad kmod package: Must require only one kernel") - continue - - # Figure out the real name of this kmod -@@ -133,7 +136,7 @@ - # Yum bug - name = fakeName(po) - elif len(name) != 1: -- print "Non compliant kmod package: %s" % po -+ log.warning("Non compliant kmod package: %s" % po) - continue - po.kmodName = name[0] - --- anaconda-11.1.2.87/findpackageset.py.smeserver 2005-02-08 07:37:30.000000000 -0700 +++ anaconda-11.1.2.87/findpackageset.py 2007-12-20 13:05:57.000000000 -0700 @@ -108,21 +108,15 @@ @@ -422,6 +388,85 @@ postScripts = filter (lambda s: s.type == KS_SCRIPT_POST, self.ksdata.scripts) +--- anaconda-11.1.2.87/lang-table.smeserver 2006-12-04 13:31:57.000000000 -0700 ++++ anaconda-11.1.2.87/lang-table 2008-03-18 09:38:10.000000000 -0600 +@@ -1,54 +1,14 @@ +-Afrikaans af latarcyrheb-sun16 af_ZA.UTF-8 us Africa/Johannesburg +-Arabic ar latarcyrheb-sun16 ar_SA.UTF-8 us Asia/Riyadh +-Assamese as none as_IN.UTF-8 us Asia/Calcutta +-Bengali bn none bn_BD.UTF-8 us Asia/Dhaka +-Bengali(India) bn none bn_IN.UTF-8 us Asia/Calcutta +-Bulgarian bg latarcyrheb-sun16 bg_BG.UTF-8 bg Europe/Sofia +-Catalan ca latarcyrheb-sun16 ca_ES.UTF-8 es Europe/Madrid +-Chinese(Simplified) zh_CN none zh_CN.UTF-8 us Asia/Shanghai +-Chinese(Traditional) zh_TW none zh_TW.UTF-8 us Asia/Taipei +-Croatian hr latarcyrheb-sun16 hr_HR.UTF-8 croat Europe/Zagreb +-Czech cs latarcyrheb-sun16 cs_CZ.UTF-8 cz-lat2 Europe/Prague + Danish da latarcyrheb-sun16 da_DK.UTF-8 dk Europe/Copenhagen + Dutch nl latarcyrheb-sun16 nl_NL.UTF-8 nl Europe/Amsterdam + English en latarcyrheb-sun16 en_US.UTF-8 us America/New_York +-Estonian et latarcyrheb-sun16 et_EE.UTF-8 et Europe/Tallinn +-Finnish fi latarcyrheb-sun16 fi_FI.UTF-8 fi Europe/Helsinki + French fr latarcyrheb-sun16 fr_FR.UTF-8 fr-latin1 Europe/Paris + German de latarcyrheb-sun16 de_DE.UTF-8 de-latin1-nodeadkeys Europe/Berlin + Greek el iso07u-16 el_GR.UTF-8 gr Europe/Athens +-Gujarati gu none gu_IN.UTF-8 us Asia/Calcutta +-Hindi hi none hi_IN.UTF-8 us Asia/Calcutta + Hungarian hu latarcyrheb-sun16 hu_HU.UTF-8 hu Europe/Budapest +-Icelandic is latarcyrheb-sun16 is_IS.UTF-8 is-latin1 Atlantic/Reykjavik + Indonesian id latarcryheb-sun16 id_ID.UTF-8 us Asia/Jakarta + Italian it latarcyrheb-sun16 it_IT.UTF-8 it Europe/Rome +-Japanese ja none ja_JP.UTF-8 jp106 Asia/Tokyo +-Kannada kn none kn_IN.UTF-8 us Asia/Calcutta +-Korean ko none ko_KR.UTF-8 us Asia/Seoul +-Macedonian mk latarcyrheb-sun16 mk_MK.UTF-8 mk Europe/Skopje +-Malay ms latarcyrheb-sun16 ms_MY.UTF-8 us Asia/Kuala_Lumpur +-Malayalam ml none ml_IN.UTF-8 us Asia/Calcutta +-Marathi mr none mr_IN.UTF-8 us Asia/Calcutta +-Norwegian nb latarcyrheb-sun16 nb_NO.UTF-8 no Europe/Oslo +-Northern Sotho nso latarcyrheb-sun16 nso_ZA.UTF-8 us Africa/Johannesburg +-Oriya or none or_IN.UTF-8 us Asia/Calcutta +-Polish pl latarcyrheb-sun16 pl_PL.UTF-8 pl2 Europe/Warsaw + Portuguese pt latarcyrheb-sun16 pt_PT.UTF-8 pt-latin1 Europe/Lisbon + Portuguese(Brazilian) pt_BR latarcyrheb-sun16 pt_BR.UTF-8 br-abnt2 America/Sao_Paulo +-Punjabi pa none pa_IN.UTF-8 us Asia/Calcutta +-Russian ru latarcyrheb-sun16 ru_RU.UTF-8 ru Europe/Moscow +-Serbian sr latarcyrheb-sun16 sr_CS.UTF-8 sr-cy Europe/Belgrade +-Serbian(Latin) sr@Latn latarcyrheb-sun16 sr_CS.UTF-8@Latn sr-cy Europe/Belgrade +-Sinhala si none si_LK.UTF-8 us Asia/Colombo +-Slovak sk latarcyrheb-sun16 sk_SK.UTF-8 sk-qwerty Europe/Bratislava + Slovenian sl latarcyrheb-sun16 sl_SI.UTF-8 slovene Europe/Ljubljana + Spanish es latarcyrheb-sun16 es_ES.UTF-8 es Europe/Madrid + Swedish sv latarcyrheb-sun16 sv_SE.UTF-8 sv-latin1 Europe/Stockholm +-Tamil ta none ta_IN.UTF-8 us Asia/Calcutta +-Telugu te none te_IN.UTF-8 us Asia/Calcutta +-Turkish tr latarcyrheb-sun16 tr_TR.UTF-8 trq Europe/Istanbul +-Ukrainian uk latarcyrheb-sun16 uk_UA.UTF-8 ua-utf Europe/Kiev +-Vietnamese vi latarcyrheb-sun16 vi_VN.UTF-8 us Asia/Saigon +-Welsh cy latarcyrheb-sun16 cy_GB.UTF-8 uk Europe/London +-Zulu zu latarcyrheb-sun16 zu_ZA.UTF-8 us Africa/Johannesburg +--- anaconda-11.1.2.87/language.py.smeserver 2006-10-10 11:18:09.000000000 -0600 ++++ anaconda-11.1.2.87/language.py 2008-03-18 09:43:03.000000000 -0600 +@@ -57,7 +57,9 @@ + self.current = "en_US.UTF-8" + + # English name -> native name mapping +- search = ('lang-names', '/usr/lib/anaconda/lang-names') ++ search = ('lang-names', '/tmp/updates/lang-names', ++ '/mnt/source/RHupdates/lang-names', ++ '/usr/lib/anaconda/lang-names') + for path in search: + if os.access(path, os.R_OK): + f = open(path, 'r') +@@ -111,6 +111,8 @@ + + def getNickByName (self, name): + for k in self.localeInfo.keys(): ++ if k == 'C': ++ continue + row = self.localeInfo[k] + if row[0] == name: + return k --- anaconda-11.1.2.87/packages.py.smeserver 2007-12-20 13:41:11.000000000 -0700 +++ anaconda-11.1.2.87/packages.py 2007-12-20 13:40:41.000000000 -0700 @@ -146,6 +146,7 @@ @@ -434,11 +479,22 @@ anaconda.id.fsset.formatSwap(anaconda.rootPath) --- anaconda-11.1.2.87/partedUtils.py.smeserver 2007-07-12 10:16:05.000000000 -0600 +++ anaconda-11.1.2.87/partedUtils.py 2007-12-20 13:43:33.000000000 -0700 +@@ -507,8 +507,8 @@ + return None + + def getReleaseString(mountpoint): +- if os.access(mountpoint + "/etc/redhat-release", os.R_OK): +- f = open(mountpoint + "/etc/redhat-release", "r") ++ if os.access(mountpoint + "/etc/e-smith-release", os.R_OK): ++ f = open(mountpoint + "/etc/e-smith-release", "r") + try: + lines = f.readlines() + except IOError: @@ -550,6 +550,7 @@ return 1 productUpgrades = { -+ "SME Server": ("Mitel Networks", "SME Server", "CentOS 5"), ++ "SME Server": ("Mitel Networks", "SME Server"), "Red Hat Enterprise Linux AS": ("Red Hat Linux Advanced Server", ), "Red Hat Enterprise Linux WS": ("Red Hat Linux Advanced Workstation",), # FIXME: this probably shouldn't be in a release... @@ -490,60 +546,68 @@ else: anaconda.dispatch.gotoNext() ---- anaconda-11.1.2.87/lang-table.smeserver 2006-12-04 13:31:57.000000000 -0700 -+++ anaconda-11.1.2.87/lang-table 2007-12-20 14:07:37.000000000 -0700 -@@ -1,54 +1,8 @@ --Afrikaans af latarcyrheb-sun16 af_ZA.UTF-8 us Africa/Johannesburg --Arabic ar latarcyrheb-sun16 ar_SA.UTF-8 us Asia/Riyadh --Assamese as none as_IN.UTF-8 us Asia/Calcutta --Bengali bn none bn_BD.UTF-8 us Asia/Dhaka --Bengali(India) bn none bn_IN.UTF-8 us Asia/Calcutta --Bulgarian bg latarcyrheb-sun16 bg_BG.UTF-8 bg Europe/Sofia - Catalan ca latarcyrheb-sun16 ca_ES.UTF-8 es Europe/Madrid --Chinese(Simplified) zh_CN none zh_CN.UTF-8 us Asia/Shanghai --Chinese(Traditional) zh_TW none zh_TW.UTF-8 us Asia/Taipei --Croatian hr latarcyrheb-sun16 hr_HR.UTF-8 croat Europe/Zagreb --Czech cs latarcyrheb-sun16 cs_CZ.UTF-8 cz-lat2 Europe/Prague --Danish da latarcyrheb-sun16 da_DK.UTF-8 dk Europe/Copenhagen - Dutch nl latarcyrheb-sun16 nl_NL.UTF-8 nl Europe/Amsterdam - English en latarcyrheb-sun16 en_US.UTF-8 us America/New_York --Estonian et latarcyrheb-sun16 et_EE.UTF-8 et Europe/Tallinn --Finnish fi latarcyrheb-sun16 fi_FI.UTF-8 fi Europe/Helsinki - French fr latarcyrheb-sun16 fr_FR.UTF-8 fr-latin1 Europe/Paris - German de latarcyrheb-sun16 de_DE.UTF-8 de-latin1-nodeadkeys Europe/Berlin --Greek el iso07u-16 el_GR.UTF-8 gr Europe/Athens --Gujarati gu none gu_IN.UTF-8 us Asia/Calcutta --Hindi hi none hi_IN.UTF-8 us Asia/Calcutta --Hungarian hu latarcyrheb-sun16 hu_HU.UTF-8 hu Europe/Budapest --Icelandic is latarcyrheb-sun16 is_IS.UTF-8 is-latin1 Atlantic/Reykjavik --Indonesian id latarcryheb-sun16 id_ID.UTF-8 us Asia/Jakarta - Italian it latarcyrheb-sun16 it_IT.UTF-8 it Europe/Rome --Japanese ja none ja_JP.UTF-8 jp106 Asia/Tokyo --Kannada kn none kn_IN.UTF-8 us Asia/Calcutta --Korean ko none ko_KR.UTF-8 us Asia/Seoul --Macedonian mk latarcyrheb-sun16 mk_MK.UTF-8 mk Europe/Skopje --Malay ms latarcyrheb-sun16 ms_MY.UTF-8 us Asia/Kuala_Lumpur --Malayalam ml none ml_IN.UTF-8 us Asia/Calcutta --Marathi mr none mr_IN.UTF-8 us Asia/Calcutta --Norwegian nb latarcyrheb-sun16 nb_NO.UTF-8 no Europe/Oslo --Northern Sotho nso latarcyrheb-sun16 nso_ZA.UTF-8 us Africa/Johannesburg --Oriya or none or_IN.UTF-8 us Asia/Calcutta --Polish pl latarcyrheb-sun16 pl_PL.UTF-8 pl2 Europe/Warsaw --Portuguese pt latarcyrheb-sun16 pt_PT.UTF-8 pt-latin1 Europe/Lisbon --Portuguese(Brazilian) pt_BR latarcyrheb-sun16 pt_BR.UTF-8 br-abnt2 America/Sao_Paulo --Punjabi pa none pa_IN.UTF-8 us Asia/Calcutta --Russian ru latarcyrheb-sun16 ru_RU.UTF-8 ru Europe/Moscow --Serbian sr latarcyrheb-sun16 sr_CS.UTF-8 sr-cy Europe/Belgrade --Serbian(Latin) sr@Latn latarcyrheb-sun16 sr_CS.UTF-8@Latn sr-cy Europe/Belgrade --Sinhala si none si_LK.UTF-8 us Asia/Colombo --Slovak sk latarcyrheb-sun16 sk_SK.UTF-8 sk-qwerty Europe/Bratislava --Slovenian sl latarcyrheb-sun16 sl_SI.UTF-8 slovene Europe/Ljubljana - Spanish es latarcyrheb-sun16 es_ES.UTF-8 es Europe/Madrid - Swedish sv latarcyrheb-sun16 sv_SE.UTF-8 sv-latin1 Europe/Stockholm --Tamil ta none ta_IN.UTF-8 us Asia/Calcutta --Telugu te none te_IN.UTF-8 us Asia/Calcutta --Turkish tr latarcyrheb-sun16 tr_TR.UTF-8 trq Europe/Istanbul --Ukrainian uk latarcyrheb-sun16 uk_UA.UTF-8 ua-utf Europe/Kiev --Vietnamese vi latarcyrheb-sun16 vi_VN.UTF-8 us Asia/Saigon --Welsh cy latarcyrheb-sun16 cy_GB.UTF-8 uk Europe/London --Zulu zu latarcyrheb-sun16 zu_ZA.UTF-8 us Africa/Johannesburg +--- anaconda-11.1.2.87/upgrade.py.smeserver 2007-01-22 16:14:06.000000000 -0700 ++++ anaconda-11.1.2.87/upgrade.py 2008-03-18 09:10:12.000000000 -0600 +@@ -113,7 +113,7 @@ + + if anaconda.id.rootParts is not None and len(anaconda.id.rootParts) > 0: + anaconda.dispatch.skipStep("findinstall", skip = 0) +- if productName.find("Red Hat Enterprise Linux") == -1: ++ if productName.find("SME Server") == -1: + anaconda.dispatch.skipStep("installtype", skip = 1) + else: + anaconda.dispatch.skipStep("findinstall", skip = 1) +--- anaconda-11.1.2.87/yuminstall.py.smeserver 2007-09-11 11:51:21.000000000 -0600 ++++ anaconda-11.1.2.87/yuminstall.py 2008-03-17 08:01:27.000000000 -0600 +@@ -1083,7 +1083,8 @@ + + if foundModule == 1: + for (n, arch, tag) in kernelVersions: +- recreateInitrd(n, anaconda.rootPath) ++ if os.access("/boot/System.map-%s" %(n,), os.X_OK): ++ recreateInitrd(n, anaconda.rootPath) + + def selectBestKernel(self, anaconda): + """Find the best kernel package which is available and select it.""" +@@ -1654,10 +1654,10 @@ + # Figure out current version for upgrade nag and for determining weird + # upgrade cases + supportedUpgradeVersion = -1 +- for pkgtup in self.ayum.rpmdb.whatProvides('redhat-release', None, None): ++ for pkgtup in self.ayum.rpmdb.whatProvides('e-smith-release', None, None): + n, a, e, v, r = pkgtup + if supportedUpgradeVersion <= 0: +- val = rpmUtils.miscutils.compareEVR((None, '3', '1'), ++ val = rpmUtils.miscutils.compareEVR(('26', '7.3', '1.el4.sme'), + (e, v,r)) + if val > 0: + supportedUpgradeVersion = 0 +@@ -1665,9 +1665,6 @@ + supportedUpgradeVersion = 1 + break + +- if productName.find("Red Hat Enterprise Linux") == -1: +- supportedUpgradeVersion = 1 +- + if supportedUpgradeVersion == 0: + rc = anaconda.intf.messageWindow(_("Warning"), + _("You appear to be upgrading from a system " +@@ -1681,7 +1678,7 @@ + try: + os.unlink("%s/var/lib/rpm/%s" %(anaconda.rootPath, rpmfile)) + except: +- log.info("error %s removing file: /var/lib/rpm/%s" %(e,rpmfile)) ++ #log.info("error %s removing file: /var/lib/rpm/%s" %(e,rpmfile)) + pass + sys.exit(0) + +@@ -1729,7 +1730,8 @@ + # to the old method. + if len(self._installedDriverModules) == len(anaconda.id.extraModules): + for (n, arch, tag) in self.kernelVersionList(): +- recreateInitrd(n, anaconda.rootPath) ++ if os.access("/boot/System.map-%s" %(n,), os.X_OK): ++ recreateInitrd(n, anaconda.rootPath) + else: + modulesList = filter(lambda m: m not in self._installedDriverModules, anaconda.id.extraModules) + self.copyExtraModules(anaconda, modulesList)