47 |
|
|
48 |
return INSTALL_OK |
return INSTALL_OK |
49 |
|
|
50 |
--- anaconda-11.1.2.87/textw/upgrade_bootloader_text.py.smeserver 2006-05-04 13:58:53.000000000 -0600 |
--- anaconda-11.1.2.87/textw/upgrade_bootloader_text.py.sme 2006-05-04 13:58:53.000000000 -0600 |
51 |
+++ anaconda-11.1.2.87/textw/upgrade_bootloader_text.py 2007-12-20 14:23:49.000000000 -0700 |
+++ anaconda-11.1.2.87/textw/upgrade_bootloader_text.py 2008-03-31 13:13:42.000000000 -0600 |
52 |
@@ -31,88 +31,11 @@ |
@@ -44,75 +44,24 @@ |
53 |
(self.type, self.bootDev) = \ |
else: |
54 |
checkbootloader.getBootloaderTypeAndBoot(anaconda.rootPath) |
nobl = 1 |
55 |
|
|
|
- blradio = RadioGroup() |
|
|
- |
|
|
- (update, newbl, nobl) = (0, 0, 0) |
|
|
- if not self.dispatch.stepInSkipList("bootloader"): |
|
|
- newbl = 1 |
|
|
- elif self.dispatch.stepInSkipList("instbootloader"): |
|
|
- nobl = 1 |
|
|
- else: |
|
|
- if self.type is not None and self.bootDev is not None: |
|
|
- update = 1 |
|
|
- else: |
|
|
- nobl = 1 |
|
|
- |
|
56 |
- if self.type is not None and self.bootDev is not None: |
- if self.type is not None and self.bootDev is not None: |
57 |
- t = TextboxReflowed(53, |
- t = TextboxReflowed(53, |
58 |
- _("The installer has detected the %s boot " |
- _("The installer has detected the %s boot " |
61 |
- |
- |
62 |
- self.update_radio = blradio.add(_("Update boot loader configuration"), |
- self.update_radio = blradio.add(_("Update boot loader configuration"), |
63 |
- "update", update) |
- "update", update) |
64 |
- else: |
+ if nobl == 1: |
65 |
|
+ self.dispatch.skipStep("bootloadersetup", skip = 1) |
66 |
|
+ self.dispatch.skipStep("bootloader", skip = 1) |
67 |
|
+ self.dispatch.skipStep("bootloaderadvanced", skip = 1) |
68 |
|
+ self.dispatch.skipStep("instbootloader", skip = 1) |
69 |
|
+ elif newbl == 1: |
70 |
|
+ self.dispatch.skipStep("bootloadersetup", skip = 0) |
71 |
|
+ self.dispatch.skipStep("bootloader", skip = 1) |
72 |
|
+ self.dispatch.skipStep("bootloaderadvanced", skip = 1) |
73 |
|
+ self.dispatch.skipStep("instbootloader", skip = 0) |
74 |
|
+ self.bl.doUpgradeOnly = 0 |
75 |
|
else: |
76 |
- t = TextboxReflowed(53, |
- t = TextboxReflowed(53, |
77 |
- _("The installer is unable to detect the boot loader " |
- _("The installer is unable to detect the boot loader " |
78 |
- "currently in use on your system.")) |
- "currently in use on your system.")) |
133 |
- self.bl.setDevice(self.bootDev) |
- self.bl.setDevice(self.bootDev) |
134 |
- |
- |
135 |
- |
- |
136 |
- |
+ self.dispatch.skipStep("bootloadersetup", skip = 0) |
137 |
|
+ self.dispatch.skipStep("bootloader", skip = 1) |
138 |
|
+ self.dispatch.skipStep("bootloaderadvanced", skip = 1) |
139 |
|
+ self.dispatch.skipStep("instbootloader", skip = 0) |
140 |
|
+ self.bl.doUpgradeOnly = 1 |
141 |
|
+ self.bl.useGrubVal = 1 |
142 |
|
+ self.bl.setDevice(self.bootDev) |
143 |
|
|
144 |
- screen.popWindow() |
- screen.popWindow() |
145 |
- return INSTALL_OK |
- return INSTALL_OK |
|
+ self.dispatch.skipStep("bootloadersetup", skip = 0) |
|
|
+ self.dispatch.skipStep("bootloader", skip = 1) |
|
|
+ self.dispatch.skipStep("bootloaderadvanced", skip = 1) |
|
|
+ self.dispatch.skipStep("instbootloader", skip = 0) |
|
|
+ self.bl.doUpgradeOnly = 1 |
|
|
+ self.bl.useGrubVal = 1 |
|
|
+ self.bl.setDevice(self.bootDev) |
|
146 |
+ return INSTALL_OK |
+ return INSTALL_OK |
147 |
--- anaconda-11.1.2.87/textw/upgrade_text.py.smeserver 2007-01-22 16:14:06.000000000 -0700 |
--- anaconda-11.1.2.87/textw/upgrade_text.py.smeserver 2007-01-22 16:14:06.000000000 -0700 |
148 |
+++ anaconda-11.1.2.87/textw/upgrade_text.py 2007-12-20 13:59:27.000000000 -0700 |
+++ anaconda-11.1.2.87/textw/upgrade_text.py 2007-12-20 13:59:27.000000000 -0700 |
386 |
postScripts = filter (lambda s: s.type == KS_SCRIPT_POST, |
postScripts = filter (lambda s: s.type == KS_SCRIPT_POST, |
387 |
self.ksdata.scripts) |
self.ksdata.scripts) |
388 |
|
|
389 |
|
--- anaconda-11.1.2.87/lang-table.smeserver 2006-12-04 13:31:57.000000000 -0700 |
390 |
|
+++ anaconda-11.1.2.87/lang-table 2008-03-18 09:38:10.000000000 -0600 |
391 |
|
@@ -1,54 +1,14 @@ |
392 |
|
-Afrikaans af latarcyrheb-sun16 af_ZA.UTF-8 us Africa/Johannesburg |
393 |
|
-Arabic ar latarcyrheb-sun16 ar_SA.UTF-8 us Asia/Riyadh |
394 |
|
-Assamese as none as_IN.UTF-8 us Asia/Calcutta |
395 |
|
-Bengali bn none bn_BD.UTF-8 us Asia/Dhaka |
396 |
|
-Bengali(India) bn none bn_IN.UTF-8 us Asia/Calcutta |
397 |
|
-Bulgarian bg latarcyrheb-sun16 bg_BG.UTF-8 bg Europe/Sofia |
398 |
|
-Catalan ca latarcyrheb-sun16 ca_ES.UTF-8 es Europe/Madrid |
399 |
|
-Chinese(Simplified) zh_CN none zh_CN.UTF-8 us Asia/Shanghai |
400 |
|
-Chinese(Traditional) zh_TW none zh_TW.UTF-8 us Asia/Taipei |
401 |
|
-Croatian hr latarcyrheb-sun16 hr_HR.UTF-8 croat Europe/Zagreb |
402 |
|
-Czech cs latarcyrheb-sun16 cs_CZ.UTF-8 cz-lat2 Europe/Prague |
403 |
|
Danish da latarcyrheb-sun16 da_DK.UTF-8 dk Europe/Copenhagen |
404 |
|
Dutch nl latarcyrheb-sun16 nl_NL.UTF-8 nl Europe/Amsterdam |
405 |
|
English en latarcyrheb-sun16 en_US.UTF-8 us America/New_York |
406 |
|
-Estonian et latarcyrheb-sun16 et_EE.UTF-8 et Europe/Tallinn |
407 |
|
-Finnish fi latarcyrheb-sun16 fi_FI.UTF-8 fi Europe/Helsinki |
408 |
|
French fr latarcyrheb-sun16 fr_FR.UTF-8 fr-latin1 Europe/Paris |
409 |
|
German de latarcyrheb-sun16 de_DE.UTF-8 de-latin1-nodeadkeys Europe/Berlin |
410 |
|
Greek el iso07u-16 el_GR.UTF-8 gr Europe/Athens |
411 |
|
-Gujarati gu none gu_IN.UTF-8 us Asia/Calcutta |
412 |
|
-Hindi hi none hi_IN.UTF-8 us Asia/Calcutta |
413 |
|
Hungarian hu latarcyrheb-sun16 hu_HU.UTF-8 hu Europe/Budapest |
414 |
|
-Icelandic is latarcyrheb-sun16 is_IS.UTF-8 is-latin1 Atlantic/Reykjavik |
415 |
|
Indonesian id latarcryheb-sun16 id_ID.UTF-8 us Asia/Jakarta |
416 |
|
Italian it latarcyrheb-sun16 it_IT.UTF-8 it Europe/Rome |
417 |
|
-Japanese ja none ja_JP.UTF-8 jp106 Asia/Tokyo |
418 |
|
-Kannada kn none kn_IN.UTF-8 us Asia/Calcutta |
419 |
|
-Korean ko none ko_KR.UTF-8 us Asia/Seoul |
420 |
|
-Macedonian mk latarcyrheb-sun16 mk_MK.UTF-8 mk Europe/Skopje |
421 |
|
-Malay ms latarcyrheb-sun16 ms_MY.UTF-8 us Asia/Kuala_Lumpur |
422 |
|
-Malayalam ml none ml_IN.UTF-8 us Asia/Calcutta |
423 |
|
-Marathi mr none mr_IN.UTF-8 us Asia/Calcutta |
424 |
|
-Norwegian nb latarcyrheb-sun16 nb_NO.UTF-8 no Europe/Oslo |
425 |
|
-Northern Sotho nso latarcyrheb-sun16 nso_ZA.UTF-8 us Africa/Johannesburg |
426 |
|
-Oriya or none or_IN.UTF-8 us Asia/Calcutta |
427 |
|
-Polish pl latarcyrheb-sun16 pl_PL.UTF-8 pl2 Europe/Warsaw |
428 |
|
Portuguese pt latarcyrheb-sun16 pt_PT.UTF-8 pt-latin1 Europe/Lisbon |
429 |
|
Portuguese(Brazilian) pt_BR latarcyrheb-sun16 pt_BR.UTF-8 br-abnt2 America/Sao_Paulo |
430 |
|
-Punjabi pa none pa_IN.UTF-8 us Asia/Calcutta |
431 |
|
-Russian ru latarcyrheb-sun16 ru_RU.UTF-8 ru Europe/Moscow |
432 |
|
-Serbian sr latarcyrheb-sun16 sr_CS.UTF-8 sr-cy Europe/Belgrade |
433 |
|
-Serbian(Latin) sr@Latn latarcyrheb-sun16 sr_CS.UTF-8@Latn sr-cy Europe/Belgrade |
434 |
|
-Sinhala si none si_LK.UTF-8 us Asia/Colombo |
435 |
|
-Slovak sk latarcyrheb-sun16 sk_SK.UTF-8 sk-qwerty Europe/Bratislava |
436 |
|
Slovenian sl latarcyrheb-sun16 sl_SI.UTF-8 slovene Europe/Ljubljana |
437 |
|
Spanish es latarcyrheb-sun16 es_ES.UTF-8 es Europe/Madrid |
438 |
|
Swedish sv latarcyrheb-sun16 sv_SE.UTF-8 sv-latin1 Europe/Stockholm |
439 |
|
-Tamil ta none ta_IN.UTF-8 us Asia/Calcutta |
440 |
|
-Telugu te none te_IN.UTF-8 us Asia/Calcutta |
441 |
|
-Turkish tr latarcyrheb-sun16 tr_TR.UTF-8 trq Europe/Istanbul |
442 |
|
-Ukrainian uk latarcyrheb-sun16 uk_UA.UTF-8 ua-utf Europe/Kiev |
443 |
|
-Vietnamese vi latarcyrheb-sun16 vi_VN.UTF-8 us Asia/Saigon |
444 |
|
-Welsh cy latarcyrheb-sun16 cy_GB.UTF-8 uk Europe/London |
445 |
|
-Zulu zu latarcyrheb-sun16 zu_ZA.UTF-8 us Africa/Johannesburg |
446 |
|
--- anaconda-11.1.2.87/language.py.smeserver 2006-10-10 11:18:09.000000000 -0600 |
447 |
|
+++ anaconda-11.1.2.87/language.py 2008-03-18 09:43:03.000000000 -0600 |
448 |
|
@@ -57,7 +57,9 @@ |
449 |
|
self.current = "en_US.UTF-8" |
450 |
|
|
451 |
|
# English name -> native name mapping |
452 |
|
- search = ('lang-names', '/usr/lib/anaconda/lang-names') |
453 |
|
+ search = ('lang-names', '/tmp/updates/lang-names', |
454 |
|
+ '/mnt/source/RHupdates/lang-names', |
455 |
|
+ '/usr/lib/anaconda/lang-names') |
456 |
|
for path in search: |
457 |
|
if os.access(path, os.R_OK): |
458 |
|
f = open(path, 'r') |
459 |
|
@@ -111,6 +111,8 @@ |
460 |
|
|
461 |
|
def getNickByName (self, name): |
462 |
|
for k in self.localeInfo.keys(): |
463 |
|
+ if k == 'C': |
464 |
|
+ continue |
465 |
|
row = self.localeInfo[k] |
466 |
|
if row[0] == name: |
467 |
|
return k |
468 |
--- 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 |
469 |
+++ 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 |
470 |
@@ -146,6 +146,7 @@ |
@@ -146,6 +146,7 @@ |
477 |
anaconda.id.fsset.formatSwap(anaconda.rootPath) |
anaconda.id.fsset.formatSwap(anaconda.rootPath) |
478 |
--- 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 |
479 |
+++ 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 |
480 |
|
@@ -507,8 +507,8 @@ |
481 |
|
return None |
482 |
|
|
483 |
|
def getReleaseString(mountpoint): |
484 |
|
- if os.access(mountpoint + "/etc/redhat-release", os.R_OK): |
485 |
|
- f = open(mountpoint + "/etc/redhat-release", "r") |
486 |
|
+ if os.access(mountpoint + "/etc/e-smith-release", os.R_OK): |
487 |
|
+ f = open(mountpoint + "/etc/e-smith-release", "r") |
488 |
|
try: |
489 |
|
lines = f.readlines() |
490 |
|
except IOError: |
491 |
@@ -550,6 +550,7 @@ |
@@ -550,6 +550,7 @@ |
492 |
return 1 |
return 1 |
493 |
|
|
494 |
productUpgrades = { |
productUpgrades = { |
495 |
+ "SME Server": ("Mitel Networks", "SME Server", "CentOS 5"), |
+ "SME Server": ("Mitel Networks", "SME Server"), |
496 |
"Red Hat Enterprise Linux AS": ("Red Hat Linux Advanced Server", ), |
"Red Hat Enterprise Linux AS": ("Red Hat Linux Advanced Server", ), |
497 |
"Red Hat Enterprise Linux WS": ("Red Hat Linux Advanced Workstation",), |
"Red Hat Enterprise Linux WS": ("Red Hat Linux Advanced Workstation",), |
498 |
# FIXME: this probably shouldn't be in a release... |
# FIXME: this probably shouldn't be in a release... |
544 |
else: |
else: |
545 |
anaconda.dispatch.gotoNext() |
anaconda.dispatch.gotoNext() |
546 |
|
|
547 |
--- anaconda-11.1.2.87/yuminstall.py.sme 2007-09-11 11:51:21.000000000 -0600 |
--- anaconda-11.1.2.87/upgrade.py.smeserver 2007-01-22 16:14:06.000000000 -0700 |
548 |
|
+++ anaconda-11.1.2.87/upgrade.py 2008-03-18 09:10:12.000000000 -0600 |
549 |
|
@@ -113,7 +113,7 @@ |
550 |
|
|
551 |
|
if anaconda.id.rootParts is not None and len(anaconda.id.rootParts) > 0: |
552 |
|
anaconda.dispatch.skipStep("findinstall", skip = 0) |
553 |
|
- if productName.find("Red Hat Enterprise Linux") == -1: |
554 |
|
+ if productName.find("SME Server") == -1: |
555 |
|
anaconda.dispatch.skipStep("installtype", skip = 1) |
556 |
|
else: |
557 |
|
anaconda.dispatch.skipStep("findinstall", skip = 1) |
558 |
|
--- anaconda-11.1.2.87/yuminstall.py.smeserver 2007-09-11 11:51:21.000000000 -0600 |
559 |
+++ anaconda-11.1.2.87/yuminstall.py 2008-03-17 08:01:27.000000000 -0600 |
+++ anaconda-11.1.2.87/yuminstall.py 2008-03-17 08:01:27.000000000 -0600 |
560 |
@@ -1083,7 +1083,8 @@ |
@@ -1083,7 +1083,8 @@ |
561 |
|
|
567 |
|
|
568 |
def selectBestKernel(self, anaconda): |
def selectBestKernel(self, anaconda): |
569 |
"""Find the best kernel package which is available and select it.""" |
"""Find the best kernel package which is available and select it.""" |
570 |
|
@@ -1654,10 +1654,10 @@ |
571 |
|
# Figure out current version for upgrade nag and for determining weird |
572 |
|
# upgrade cases |
573 |
|
supportedUpgradeVersion = -1 |
574 |
|
- for pkgtup in self.ayum.rpmdb.whatProvides('redhat-release', None, None): |
575 |
|
+ for pkgtup in self.ayum.rpmdb.whatProvides('e-smith-release', None, None): |
576 |
|
n, a, e, v, r = pkgtup |
577 |
|
if supportedUpgradeVersion <= 0: |
578 |
|
- val = rpmUtils.miscutils.compareEVR((None, '3', '1'), |
579 |
|
+ val = rpmUtils.miscutils.compareEVR(('26', '7.3', '1.el4.sme'), |
580 |
|
(e, v,r)) |
581 |
|
if val > 0: |
582 |
|
supportedUpgradeVersion = 0 |
583 |
|
@@ -1665,9 +1665,6 @@ |
584 |
|
supportedUpgradeVersion = 1 |
585 |
|
break |
586 |
|
|
587 |
|
- if productName.find("Red Hat Enterprise Linux") == -1: |
588 |
|
- supportedUpgradeVersion = 1 |
589 |
|
- |
590 |
|
if supportedUpgradeVersion == 0: |
591 |
|
rc = anaconda.intf.messageWindow(_("Warning"), |
592 |
|
_("You appear to be upgrading from a system " |
593 |
|
@@ -1681,7 +1678,7 @@ |
594 |
|
try: |
595 |
|
os.unlink("%s/var/lib/rpm/%s" %(anaconda.rootPath, rpmfile)) |
596 |
|
except: |
597 |
|
- log.info("error %s removing file: /var/lib/rpm/%s" %(e,rpmfile)) |
598 |
|
+ #log.info("error %s removing file: /var/lib/rpm/%s" %(e,rpmfile)) |
599 |
|
pass |
600 |
|
sys.exit(0) |
601 |
|
|
602 |
@@ -1729,7 +1730,8 @@ |
@@ -1729,7 +1730,8 @@ |
603 |
# to the old method. |
# to the old method. |
604 |
if len(self._installedDriverModules) == len(anaconda.id.extraModules): |
if len(self._installedDriverModules) == len(anaconda.id.extraModules): |