172 |
- else: |
- else: |
173 |
- devname = drive |
- devname = drive |
174 |
- partList.append("%s (%s)" %(desc, drive)) |
- partList.append("%s (%s)" %(desc, drive)) |
175 |
+ partList.append("Upgrade existing \"%s\" system" %(desc)) |
+ partList.append(_("Upgrade existing \"%s\" system") %(desc)) |
176 |
|
|
177 |
(button, choice) = ListboxChoiceWindow(screen, _("System to Upgrade"), |
(button, choice) = ListboxChoiceWindow(screen, _("System to Upgrade"), |
178 |
- _("One or more existing Linux installations " |
- _("One or more existing Linux installations " |
388 |
postScripts = filter (lambda s: s.type == KS_SCRIPT_POST, |
postScripts = filter (lambda s: s.type == KS_SCRIPT_POST, |
389 |
self.ksdata.scripts) |
self.ksdata.scripts) |
390 |
|
|
391 |
|
--- anaconda-11.1.2.87/lang-table.sme 2006-12-04 13:31:57.000000000 -0700 |
392 |
|
+++ anaconda-11.1.2.87/lang-table 2008-03-18 09:38:10.000000000 -0600 |
393 |
|
@@ -1,54 +1,14 @@ |
394 |
|
-Afrikaans af latarcyrheb-sun16 af_ZA.UTF-8 us Africa/Johannesburg |
395 |
|
-Arabic ar latarcyrheb-sun16 ar_SA.UTF-8 us Asia/Riyadh |
396 |
|
-Assamese as none as_IN.UTF-8 us Asia/Calcutta |
397 |
|
-Bengali bn none bn_BD.UTF-8 us Asia/Dhaka |
398 |
|
-Bengali(India) bn none bn_IN.UTF-8 us Asia/Calcutta |
399 |
|
-Bulgarian bg latarcyrheb-sun16 bg_BG.UTF-8 bg Europe/Sofia |
400 |
|
-Catalan ca latarcyrheb-sun16 ca_ES.UTF-8 es Europe/Madrid |
401 |
|
-Chinese(Simplified) zh_CN none zh_CN.UTF-8 us Asia/Shanghai |
402 |
|
-Chinese(Traditional) zh_TW none zh_TW.UTF-8 us Asia/Taipei |
403 |
|
-Croatian hr latarcyrheb-sun16 hr_HR.UTF-8 croat Europe/Zagreb |
404 |
|
-Czech cs latarcyrheb-sun16 cs_CZ.UTF-8 cz-lat2 Europe/Prague |
405 |
|
Danish da latarcyrheb-sun16 da_DK.UTF-8 dk Europe/Copenhagen |
406 |
|
Dutch nl latarcyrheb-sun16 nl_NL.UTF-8 nl Europe/Amsterdam |
407 |
|
English en latarcyrheb-sun16 en_US.UTF-8 us America/New_York |
408 |
|
-Estonian et latarcyrheb-sun16 et_EE.UTF-8 et Europe/Tallinn |
409 |
|
-Finnish fi latarcyrheb-sun16 fi_FI.UTF-8 fi Europe/Helsinki |
410 |
|
French fr latarcyrheb-sun16 fr_FR.UTF-8 fr-latin1 Europe/Paris |
411 |
|
German de latarcyrheb-sun16 de_DE.UTF-8 de-latin1-nodeadkeys Europe/Berlin |
412 |
|
Greek el iso07u-16 el_GR.UTF-8 gr Europe/Athens |
413 |
|
-Gujarati gu none gu_IN.UTF-8 us Asia/Calcutta |
414 |
|
-Hindi hi none hi_IN.UTF-8 us Asia/Calcutta |
415 |
|
Hungarian hu latarcyrheb-sun16 hu_HU.UTF-8 hu Europe/Budapest |
416 |
|
-Icelandic is latarcyrheb-sun16 is_IS.UTF-8 is-latin1 Atlantic/Reykjavik |
417 |
|
Indonesian id latarcryheb-sun16 id_ID.UTF-8 us Asia/Jakarta |
418 |
|
Italian it latarcyrheb-sun16 it_IT.UTF-8 it Europe/Rome |
419 |
|
-Japanese ja none ja_JP.UTF-8 jp106 Asia/Tokyo |
420 |
|
-Kannada kn none kn_IN.UTF-8 us Asia/Calcutta |
421 |
|
-Korean ko none ko_KR.UTF-8 us Asia/Seoul |
422 |
|
-Macedonian mk latarcyrheb-sun16 mk_MK.UTF-8 mk Europe/Skopje |
423 |
|
-Malay ms latarcyrheb-sun16 ms_MY.UTF-8 us Asia/Kuala_Lumpur |
424 |
|
-Malayalam ml none ml_IN.UTF-8 us Asia/Calcutta |
425 |
|
-Marathi mr none mr_IN.UTF-8 us Asia/Calcutta |
426 |
|
-Norwegian nb latarcyrheb-sun16 nb_NO.UTF-8 no Europe/Oslo |
427 |
|
-Northern Sotho nso latarcyrheb-sun16 nso_ZA.UTF-8 us Africa/Johannesburg |
428 |
|
-Oriya or none or_IN.UTF-8 us Asia/Calcutta |
429 |
|
-Polish pl latarcyrheb-sun16 pl_PL.UTF-8 pl2 Europe/Warsaw |
430 |
|
Portuguese pt latarcyrheb-sun16 pt_PT.UTF-8 pt-latin1 Europe/Lisbon |
431 |
|
Portuguese(Brazilian) pt_BR latarcyrheb-sun16 pt_BR.UTF-8 br-abnt2 America/Sao_Paulo |
432 |
|
-Punjabi pa none pa_IN.UTF-8 us Asia/Calcutta |
433 |
|
-Russian ru latarcyrheb-sun16 ru_RU.UTF-8 ru Europe/Moscow |
434 |
|
-Serbian sr latarcyrheb-sun16 sr_CS.UTF-8 sr-cy Europe/Belgrade |
435 |
|
-Serbian(Latin) sr@Latn latarcyrheb-sun16 sr_CS.UTF-8@Latn sr-cy Europe/Belgrade |
436 |
|
-Sinhala si none si_LK.UTF-8 us Asia/Colombo |
437 |
|
-Slovak sk latarcyrheb-sun16 sk_SK.UTF-8 sk-qwerty Europe/Bratislava |
438 |
|
Slovenian sl latarcyrheb-sun16 sl_SI.UTF-8 slovene Europe/Ljubljana |
439 |
|
Spanish es latarcyrheb-sun16 es_ES.UTF-8 es Europe/Madrid |
440 |
|
Swedish sv latarcyrheb-sun16 sv_SE.UTF-8 sv-latin1 Europe/Stockholm |
441 |
|
-Tamil ta none ta_IN.UTF-8 us Asia/Calcutta |
442 |
|
-Telugu te none te_IN.UTF-8 us Asia/Calcutta |
443 |
|
-Turkish tr latarcyrheb-sun16 tr_TR.UTF-8 trq Europe/Istanbul |
444 |
|
-Ukrainian uk latarcyrheb-sun16 uk_UA.UTF-8 ua-utf Europe/Kiev |
445 |
|
-Vietnamese vi latarcyrheb-sun16 vi_VN.UTF-8 us Asia/Saigon |
446 |
|
-Welsh cy latarcyrheb-sun16 cy_GB.UTF-8 uk Europe/London |
447 |
|
-Zulu zu latarcyrheb-sun16 zu_ZA.UTF-8 us Africa/Johannesburg |
448 |
|
--- anaconda-11.1.2.87/language.py.sme 2006-10-10 11:18:09.000000000 -0600 |
449 |
|
+++ anaconda-11.1.2.87/language.py 2008-03-18 09:43:03.000000000 -0600 |
450 |
|
@@ -57,7 +57,9 @@ |
451 |
|
self.current = "en_US.UTF-8" |
452 |
|
|
453 |
|
# English name -> native name mapping |
454 |
|
- search = ('lang-names', '/usr/lib/anaconda/lang-names') |
455 |
|
+ search = ('lang-names', '/tmp/updates/lang-names', |
456 |
|
+ '/mny/source/RHupdates/lang-names', |
457 |
|
+ '/usr/lib/anaconda/lang-names') |
458 |
|
for path in search: |
459 |
|
if os.access(path, os.R_OK): |
460 |
|
f = open(path, 'r') |
461 |
--- anaconda-11.1.2.87/packages.py.smeserver 2007-12-20 13:41:11.000000000 -0700 |
--- anaconda-11.1.2.87/packages.py.smeserver 2007-12-20 13:41:11.000000000 -0700 |
462 |
+++ anaconda-11.1.2.87/packages.py 2007-12-20 13:40:41.000000000 -0700 |
+++ anaconda-11.1.2.87/packages.py 2007-12-20 13:40:41.000000000 -0700 |
463 |
@@ -146,6 +146,7 @@ |
@@ -146,6 +146,7 @@ |
470 |
anaconda.id.fsset.formatSwap(anaconda.rootPath) |
anaconda.id.fsset.formatSwap(anaconda.rootPath) |
471 |
--- anaconda-11.1.2.87/partedUtils.py.smeserver 2007-07-12 10:16:05.000000000 -0600 |
--- anaconda-11.1.2.87/partedUtils.py.smeserver 2007-07-12 10:16:05.000000000 -0600 |
472 |
+++ anaconda-11.1.2.87/partedUtils.py 2007-12-20 13:43:33.000000000 -0700 |
+++ anaconda-11.1.2.87/partedUtils.py 2007-12-20 13:43:33.000000000 -0700 |
473 |
|
@@ -507,8 +507,8 @@ |
474 |
|
return None |
475 |
|
|
476 |
|
def getReleaseString(mountpoint): |
477 |
|
- if os.access(mountpoint + "/etc/redhat-release", os.R_OK): |
478 |
|
- f = open(mountpoint + "/etc/redhat-release", "r") |
479 |
|
+ if os.access(mountpoint + "/etc/e-smith-release", os.R_OK): |
480 |
|
+ f = open(mountpoint + "/etc/e-smith-release", "r") |
481 |
|
try: |
482 |
|
lines = f.readlines() |
483 |
|
except IOError: |
484 |
@@ -550,6 +550,7 @@ |
@@ -550,6 +550,7 @@ |
485 |
return 1 |
return 1 |
486 |
|
|
487 |
productUpgrades = { |
productUpgrades = { |
488 |
+ "SME Server": ("Mitel Networks", "SME Server", "CentOS 5"), |
+ "SME Server": ("Mitel Networks", "SME Server"), |
489 |
"Red Hat Enterprise Linux AS": ("Red Hat Linux Advanced Server", ), |
"Red Hat Enterprise Linux AS": ("Red Hat Linux Advanced Server", ), |
490 |
"Red Hat Enterprise Linux WS": ("Red Hat Linux Advanced Workstation",), |
"Red Hat Enterprise Linux WS": ("Red Hat Linux Advanced Workstation",), |
491 |
# FIXME: this probably shouldn't be in a release... |
# FIXME: this probably shouldn't be in a release... |
537 |
else: |
else: |
538 |
anaconda.dispatch.gotoNext() |
anaconda.dispatch.gotoNext() |
539 |
|
|
540 |
--- anaconda-11.1.2.87/lang-table.smeserver 2006-12-04 13:31:57.000000000 -0700 |
--- anaconda-11.1.2.87/upgrade.py.sme 2007-01-22 16:14:06.000000000 -0700 |
541 |
+++ anaconda-11.1.2.87/lang-table 2007-12-20 14:07:37.000000000 -0700 |
+++ anaconda-11.1.2.87/upgrade.py 2008-03-18 09:10:12.000000000 -0600 |
542 |
@@ -1,54 +1,8 @@ |
@@ -113,7 +113,7 @@ |
543 |
-Afrikaans af latarcyrheb-sun16 af_ZA.UTF-8 us Africa/Johannesburg |
|
544 |
-Arabic ar latarcyrheb-sun16 ar_SA.UTF-8 us Asia/Riyadh |
if anaconda.id.rootParts is not None and len(anaconda.id.rootParts) > 0: |
545 |
-Assamese as none as_IN.UTF-8 us Asia/Calcutta |
anaconda.dispatch.skipStep("findinstall", skip = 0) |
546 |
-Bengali bn none bn_BD.UTF-8 us Asia/Dhaka |
- if productName.find("Red Hat Enterprise Linux") == -1: |
547 |
-Bengali(India) bn none bn_IN.UTF-8 us Asia/Calcutta |
+ if productName.find("SME Server") == -1: |
548 |
-Bulgarian bg latarcyrheb-sun16 bg_BG.UTF-8 bg Europe/Sofia |
anaconda.dispatch.skipStep("installtype", skip = 1) |
549 |
Catalan ca latarcyrheb-sun16 ca_ES.UTF-8 es Europe/Madrid |
else: |
550 |
-Chinese(Simplified) zh_CN none zh_CN.UTF-8 us Asia/Shanghai |
anaconda.dispatch.skipStep("findinstall", skip = 1) |
551 |
-Chinese(Traditional) zh_TW none zh_TW.UTF-8 us Asia/Taipei |
--- anaconda-11.1.2.87/yuminstall.py.sme 2007-09-11 11:51:21.000000000 -0600 |
552 |
-Croatian hr latarcyrheb-sun16 hr_HR.UTF-8 croat Europe/Zagreb |
+++ anaconda-11.1.2.87/yuminstall.py 2008-03-17 08:01:27.000000000 -0600 |
553 |
-Czech cs latarcyrheb-sun16 cs_CZ.UTF-8 cz-lat2 Europe/Prague |
@@ -1083,7 +1083,8 @@ |
554 |
-Danish da latarcyrheb-sun16 da_DK.UTF-8 dk Europe/Copenhagen |
|
555 |
Dutch nl latarcyrheb-sun16 nl_NL.UTF-8 nl Europe/Amsterdam |
if foundModule == 1: |
556 |
English en latarcyrheb-sun16 en_US.UTF-8 us America/New_York |
for (n, arch, tag) in kernelVersions: |
557 |
-Estonian et latarcyrheb-sun16 et_EE.UTF-8 et Europe/Tallinn |
- recreateInitrd(n, anaconda.rootPath) |
558 |
-Finnish fi latarcyrheb-sun16 fi_FI.UTF-8 fi Europe/Helsinki |
+ if os.access("/boot/System.map-%s" %(n,), os.X_OK): |
559 |
French fr latarcyrheb-sun16 fr_FR.UTF-8 fr-latin1 Europe/Paris |
+ recreateInitrd(n, anaconda.rootPath) |
560 |
German de latarcyrheb-sun16 de_DE.UTF-8 de-latin1-nodeadkeys Europe/Berlin |
|
561 |
-Greek el iso07u-16 el_GR.UTF-8 gr Europe/Athens |
def selectBestKernel(self, anaconda): |
562 |
-Gujarati gu none gu_IN.UTF-8 us Asia/Calcutta |
"""Find the best kernel package which is available and select it.""" |
563 |
-Hindi hi none hi_IN.UTF-8 us Asia/Calcutta |
@@ -1654,10 +1654,10 @@ |
564 |
-Hungarian hu latarcyrheb-sun16 hu_HU.UTF-8 hu Europe/Budapest |
# Figure out current version for upgrade nag and for determining weird |
565 |
-Icelandic is latarcyrheb-sun16 is_IS.UTF-8 is-latin1 Atlantic/Reykjavik |
# upgrade cases |
566 |
-Indonesian id latarcryheb-sun16 id_ID.UTF-8 us Asia/Jakarta |
supportedUpgradeVersion = -1 |
567 |
Italian it latarcyrheb-sun16 it_IT.UTF-8 it Europe/Rome |
- for pkgtup in self.ayum.rpmdb.whatProvides('redhat-release', None, None): |
568 |
-Japanese ja none ja_JP.UTF-8 jp106 Asia/Tokyo |
+ for pkgtup in self.ayum.rpmdb.whatProvides('e-smith-release', None, None): |
569 |
-Kannada kn none kn_IN.UTF-8 us Asia/Calcutta |
n, a, e, v, r = pkgtup |
570 |
-Korean ko none ko_KR.UTF-8 us Asia/Seoul |
if supportedUpgradeVersion <= 0: |
571 |
-Macedonian mk latarcyrheb-sun16 mk_MK.UTF-8 mk Europe/Skopje |
- val = rpmUtils.miscutils.compareEVR((None, '3', '1'), |
572 |
-Malay ms latarcyrheb-sun16 ms_MY.UTF-8 us Asia/Kuala_Lumpur |
+ val = rpmUtils.miscutils.compareEVR(('26', '7.3', '1.el4.sme'), |
573 |
-Malayalam ml none ml_IN.UTF-8 us Asia/Calcutta |
(e, v,r)) |
574 |
-Marathi mr none mr_IN.UTF-8 us Asia/Calcutta |
if val > 0: |
575 |
-Norwegian nb latarcyrheb-sun16 nb_NO.UTF-8 no Europe/Oslo |
supportedUpgradeVersion = 0 |
576 |
-Northern Sotho nso latarcyrheb-sun16 nso_ZA.UTF-8 us Africa/Johannesburg |
@@ -1665,9 +1665,6 @@ |
577 |
-Oriya or none or_IN.UTF-8 us Asia/Calcutta |
supportedUpgradeVersion = 1 |
578 |
-Polish pl latarcyrheb-sun16 pl_PL.UTF-8 pl2 Europe/Warsaw |
break |
579 |
-Portuguese pt latarcyrheb-sun16 pt_PT.UTF-8 pt-latin1 Europe/Lisbon |
|
580 |
-Portuguese(Brazilian) pt_BR latarcyrheb-sun16 pt_BR.UTF-8 br-abnt2 America/Sao_Paulo |
- if productName.find("Red Hat Enterprise Linux") == -1: |
581 |
-Punjabi pa none pa_IN.UTF-8 us Asia/Calcutta |
- supportedUpgradeVersion = 1 |
582 |
-Russian ru latarcyrheb-sun16 ru_RU.UTF-8 ru Europe/Moscow |
- |
583 |
-Serbian sr latarcyrheb-sun16 sr_CS.UTF-8 sr-cy Europe/Belgrade |
if supportedUpgradeVersion == 0: |
584 |
-Serbian(Latin) sr@Latn latarcyrheb-sun16 sr_CS.UTF-8@Latn sr-cy Europe/Belgrade |
rc = anaconda.intf.messageWindow(_("Warning"), |
585 |
-Sinhala si none si_LK.UTF-8 us Asia/Colombo |
_("You appear to be upgrading from a system " |
586 |
-Slovak sk latarcyrheb-sun16 sk_SK.UTF-8 sk-qwerty Europe/Bratislava |
@@ -1681,7 +1678,7 @@ |
587 |
-Slovenian sl latarcyrheb-sun16 sl_SI.UTF-8 slovene Europe/Ljubljana |
try: |
588 |
Spanish es latarcyrheb-sun16 es_ES.UTF-8 es Europe/Madrid |
os.unlink("%s/var/lib/rpm/%s" %(anaconda.rootPath, rpmfile)) |
589 |
Swedish sv latarcyrheb-sun16 sv_SE.UTF-8 sv-latin1 Europe/Stockholm |
except: |
590 |
-Tamil ta none ta_IN.UTF-8 us Asia/Calcutta |
- log.info("error %s removing file: /var/lib/rpm/%s" %(e,rpmfile)) |
591 |
-Telugu te none te_IN.UTF-8 us Asia/Calcutta |
+ #log.info("error %s removing file: /var/lib/rpm/%s" %(e,rpmfile)) |
592 |
-Turkish tr latarcyrheb-sun16 tr_TR.UTF-8 trq Europe/Istanbul |
pass |
593 |
-Ukrainian uk latarcyrheb-sun16 uk_UA.UTF-8 ua-utf Europe/Kiev |
sys.exit(0) |
594 |
-Vietnamese vi latarcyrheb-sun16 vi_VN.UTF-8 us Asia/Saigon |
|
595 |
-Welsh cy latarcyrheb-sun16 cy_GB.UTF-8 uk Europe/London |
@@ -1729,7 +1730,8 @@ |
596 |
-Zulu zu latarcyrheb-sun16 zu_ZA.UTF-8 us Africa/Johannesburg |
# to the old method. |
597 |
|
if len(self._installedDriverModules) == len(anaconda.id.extraModules): |
598 |
|
for (n, arch, tag) in self.kernelVersionList(): |
599 |
|
- recreateInitrd(n, anaconda.rootPath) |
600 |
|
+ if os.access("/boot/System.map-%s" %(n,), os.X_OK): |
601 |
|
+ recreateInitrd(n, anaconda.rootPath) |
602 |
|
else: |
603 |
|
modulesList = filter(lambda m: m not in self._installedDriverModules, anaconda.id.extraModules) |
604 |
|
self.copyExtraModules(anaconda, modulesList) |