diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/bootloader.py mezzanine_patched_anaconda-10.1.1.37/bootloader.py --- anaconda-10.1.1.37/bootloader.py 2005-04-22 22:06:17.000000000 +1000 +++ mezzanine_patched_anaconda-10.1.1.37/bootloader.py 2006-04-06 06:43:38.459411580 +1000 @@ -185,11 +185,6 @@ except BootyNoKernelWarning: if not justConfigFile: w.pop() - if intf: - intf.messageWindow(_("Warning"), - _("No kernel packages were installed on your " - "system. Your boot loader configuration " - "will not be changed.")) dosync() # note that this function no longer actually creates an initrd. diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/findpackageset.py mezzanine_patched_anaconda-10.1.1.37/findpackageset.py --- anaconda-10.1.1.37/findpackageset.py 2005-02-08 11:42:45.000000000 +1100 +++ mezzanine_patched_anaconda-10.1.1.37/findpackageset.py 2006-04-06 06:44:04.715849054 +1000 @@ -108,21 +108,15 @@ # loop through packages and find ones which are a newer # version than what we have for ( name, arch ) in instDict.keys(): - if ( name, arch ) in availDict.keys(): - # Exact arch upgrade - h = instDict[(name, arch)] - pkg = availDict[(name,arch)] - comparePackageForUpgrade(updDict, h, pkg) - else: - # See if we have a better arch than that installed - if name in availNames.keys(): - bestarch = findBestArch(availNames[name]) - if not bestarch: - continue - if availDict.has_key((name,bestarch)): - h = instDict[(name,arch)] - pkg = availDict[(name,bestarch)] - comparePackageForUpgrade(updDict, h, pkg) + # See if we have a better arch than that installed + if name in availNames.keys(): + bestarch = findBestArch(availNames[name]) + if not bestarch: + continue + if availDict.has_key((name,bestarch)): + h = instDict[(name,arch)] + pkg = availDict[(name,bestarch)] + comparePackageForUpgrade(updDict, h, pkg) # handle obsoletes for pkg in hdlist: diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/instdata.py mezzanine_patched_anaconda-10.1.1.37/instdata.py --- anaconda-10.1.1.37/instdata.py 2004-08-25 23:12:10.000000000 +1000 +++ mezzanine_patched_anaconda-10.1.1.37/instdata.py 2006-04-06 06:44:44.401953223 +1000 @@ -116,10 +116,7 @@ def write(self, instPath): self.langSupport.write (instPath) - - if not self.isHeadless: - self.keyboard.write (instPath) - + self.keyboard.write (instPath) self.timezone.write (instPath) self.auth.write (instPath) self.firewall.write (instPath) @@ -172,8 +169,8 @@ self.instLanguage.writeKS(f) self.langSupport.writeKS(f) + self.keyboard.writeKS(f) if not self.isHeadless: - self.keyboard.writeKS(f) self.xsetup.writeKS(f, self.desktop) self.network.writeKS(f) self.zfcp.writeKS(f) diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/kickstart.py mezzanine_patched_anaconda-10.1.1.37/kickstart.py --- anaconda-10.1.1.37/kickstart.py 2006-04-06 06:59:28.404442287 +1000 +++ mezzanine_patched_anaconda-10.1.1.37/kickstart.py 2006-04-06 06:45:23.609141002 +1000 @@ -99,6 +99,17 @@ name = "kickstart" def postAction(self, rootPath, serial, intf): + win = intf.waitWindow(_("Post Install Script"), + _("The post installation script is running...")) + + script = ( "/sbin/syslogd &\n" + "sleep 2\n" + "/sbin/e-smith/signal-event post-install\n" ) + s = Script(script, interp="/bin/sh", inChroot=1) + log("%s", s) + s.run(rootPath, serial) + win.pop() + log("Running kickstart %%post script(s)") for script in self.postScripts: script.run(rootPath, serial) --- anaconda-10.1.1.81/lang-table.sme 2004-10-25 06:38:22.000000000 -0600 +++ anaconda-10.1.1.81/lang-table 2008-03-07 13:34:48.000000000 -0700 @@ -1,41 +1,11 @@ -Arabic ar none ar_SA.UTF-8 us Asia/Riyadh ar_SA.UTF-8 -Bengali bn none bn_BD.UTF-8 us Asia/Dhaka bn_BD.UTF-8 -Bengali(India) bn none bn_IN.UTF-8 us Asia/Calcutta bn_IN.UTF-8 -Bulgarian bg latarcyrheb-sun16 bg_BG.UTF-8 bg Europe/Sofia bg_BG.UTF-8 -Catalan ca latarcyrheb-sun16 ca_ES.UTF-8 es Europe/Madrid es_ES.UTF-8 -Chinese(Simplified) zh_CN bterm zh_CN.UTF-8 us Asia/Shanghai zh_CN.UTF-8 -Chinese(Traditional) zh_TW bterm zh_TW.UTF-8 us Asia/Taipei zh_TW.UTF-8 -Croatian hr latarcyrheb-sun16 hr_HR.UTF-8 croat Europe/Zagreb hr_HR.UTF-8 -Czech cs latarcyrheb-sun16 cs_CZ.UTF-8 cz-lat2 Europe/Prague cs_CZ.UTF-8 -Danish da latarcyrheb-sun16 da_DK.UTF-8 dk Europe/Copenhagen da_DK.UTF-8 -Dutch nl latarcyrheb-sun16 nl_NL.UTF-8 nl Europe/Amsterdam nl_NL.UTF-8 +Dansk da latarcyrheb-sun16 da_DK.UTF-8 dk Europe/Copenhagen da_DK.UTF-8 +Deutsch de latarcyrheb-sun16 de_DE.UTF-8 de-latin1-nodeadkeys Europe/Berlin de_DE.UTF-8 English en latarcyrheb-sun16 en_US.UTF-8 us America/New_York en_US.UTF-8 -Estonian et latarcyrheb-sun16 et_EE.UTF-8 et Europe/Tallinn et_EE.UTF-8 -Finnish fi latarcyrheb-sun16 fi_FI.UTF-8 fi Europe/Helsinki fi_FI.UTF-8 -French fr latarcyrheb-sun16 fr_FR.UTF-8 fr-latin1 Europe/Paris fr_FR.UTF-8 -German de latarcyrheb-sun16 de_DE.UTF-8 de-latin1-nodeadkeys Europe/Berlin de_DE.UTF-8 -Gujarati gu none gu_IN.UTF-8 us Asia/Calcutta gu_IN.UTF-8 -Hindi hi none hi_IN.UTF-8 us Asia/Calcutta hi_IN.UTF-8 -Hungarian hu latarcyrheb-sun16 hu_HU.UTF-8 hu Europe/Budapest hu_HU.UTF-8 -Icelandic is latarcyrheb-sun16 is_IS.UTF-8 is-latin1 Atlantic/Reykjavik is_IS.UTF-8 -Italian it latarcyrheb-sun16 it_IT.UTF-8 it Europe/Rome it_IT.UTF-8 -Japanese ja bterm ja_JP.UTF-8 jp106 Asia/Tokyo ja_JP.UTF-8 -Korean ko bterm ko_KR.UTF-8 us Asia/Seoul ko_KR.UTF-8 -Macedonian mk latarcyrheb-sun16 mk_MK.UTF-8 mk Europe/Skopje mk_MK.UTF-8 -Malay ms latarcyrheb-sun16 ms_MY.UTF-8 us Asia/Kuala_Lumpur ms_MY.UTF-8 -Norwegian nb latarcyrheb-sun16 nb_NO.UTF-8 no Europe/Oslo nb_NO.UTF-8 -Persian fa none fa_IR.UTF-8 us Asia/Tehran fa_IR.UTF-8 -Polish pl latarcyrheb-sun16 pl_PL.UTF-8 pl Europe/Warsaw pl_PL.UTF-8 -Portuguese pt latarcyrheb-sun16 pt_PT.UTF-8 pt-latin1 Europe/Lisbon pt_PT.UTF-8 -Portuguese(Brazilian) pt_BR latarcyrheb-sun16 pt_BR.UTF-8 br-abnt2 America/Sao_Paulo pt_BR.UTF-8 -Punjabi pa none pa_IN.UTF-8 us Asia/Calcutta pa_IN.UTF-8 -Russian ru latarcyrheb-sun16 ru_RU.UTF-8 ru Europe/Moscow ru_RU.UTF-8 -Slovenian sl latarcyrheb-sun16 sl_SI.UTF-8 slovene Europe/Ljubljana sl_SI.UTF-8 -Spanish es latarcyrheb-sun16 es_ES.UTF-8 es Europe/Madrid es_ES.UTF-8 -Swedish sv latarcyrheb-sun16 sv_SE.UTF-8 sv-latin1 Europe/Stockholm sv_SE.UTF-8 -Tamil ta none ta_IN.UTF-8 us Asia/Calcutta ta_IN.UTF-8 -Turkish tr latarcyrheb-sun16 tr_TR.UTF-8 trq Europe/Istanbul tr_TR.UTF-8 -Ukrainian uk latarcyrheb-sun16 uk_UA.UTF-8 ua-utf Europe/Kiev uk_UA.UTF-8 -Vietnamese vi latarcyrheb-sun16 vi_VN.UTF-8 us Asia/Saigon vi_VN.UTF-8 -Welsh cy latarcyrheb-sun16 cy_GB.UTF-8 uk Europe/London cy_GB.UTF-8 -Zulu zu latarcyrheb-sun16 zu_ZA.UTF-8 us Africa/Johannesburg zu_ZA.UTF-8 +Español es latarcyrheb-sun16 es_ES.UTF-8 es Europe/Madrid es_ES.UTF-8 +Français fr latarcyrheb-sun16 fr_FR.UTF-8 fr-latin1 Europe/Paris fr_FR.UTF-8 +Italiano it latarcyrheb-sun16 it_IT.UTF-8 it Europe/Rome it_IT.UTF-8 +Magyar hu latarcyrheb-sun16 hu_HU.UTF-8 hu Europe/Budapest hu_HU.UTF-8 +Nederlands nl latarcyrheb-sun16 nl_NL.UTF-8 nl Europe/Amsterdam nl_NL.UTF-8 +Português pt latarcyrheb-sun16 pt_PT.UTF-8 pt-latin1 Europe/Lisbon pt_PT.UTF-8 +Slovenski sl latarcyrheb-sun16 sl_SI.UTF-8 slovene Europe/Ljubljana sl_SI.UTF-8 +Svensk sv latarcyrheb-sun16 sv_SE.UTF-8 sv-latin1 Europe/Stockholm sv_SE.UTF-8 --- anaconda-10.1.1.81/packages.py.sme 2008-03-17 11:02:31.000000000 -0600 +++ anaconda-10.1.1.81/packages.py 2008-03-17 11:07:55.000000000 -0600 @@ -1610,7 +1610,7 @@ "from testers, and it is not suitable " "for day to day usage.\n\n" "To report feedback, please visit:\n\n" - " http://www.centos.orrg/bugs\n\n" + " http://bugs.contribs.org/\n\n" "and file a report against '%s'.\n" %(productName, fileagainst)), type="custom", custom_icon="warning", diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/partedUtils.py mezzanine_patched_anaconda-10.1.1.37/partedUtils.py --- anaconda-10.1.1.37/partedUtils.py 2006-04-06 06:59:28.175482025 +1000 +++ mezzanine_patched_anaconda-10.1.1.37/partedUtils.py 2006-04-06 06:47:31.309955789 +1000 @@ -454,8 +454,8 @@ return None def getCentOSReleaseString(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: @@ -497,6 +497,7 @@ return 1 productUpgrades = { + "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... diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/textw/installpath_text.py mezzanine_patched_anaconda-10.1.1.37/textw/installpath_text.py --- anaconda-10.1.1.37/textw/installpath_text.py 2003-04-22 07:21:24.000000000 +1000 +++ mezzanine_patched_anaconda-10.1.1.37/textw/installpath_text.py 2006-04-06 06:56:41.641388290 +1000 @@ -45,12 +45,12 @@ if orig != None: default = orig - (button, choice) = ListboxChoiceWindow(screen, _("Installation Type"), - _("What type of system would you like to install?"), - choices, [TEXT_OK_BUTTON, TEXT_BACK_BUTTON], - width = 40, default = default, help = "installpath") + choice = default + rc = intf.messageWindow(_("Warning"), + _("All disks will be reformatted and any data will be lost. Proceed?"), + type = "yesno", default = "no") - if button == TEXT_BACK_CHECK: + if rc == 0: return INSTALL_BACK if (choice != orig): diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/textw/language_text.py mezzanine_patched_anaconda-10.1.1.37/textw/language_text.py --- anaconda-10.1.1.37/textw/language_text.py 2004-09-14 01:12:37.000000000 +1000 +++ mezzanine_patched_anaconda-10.1.1.37/textw/language_text.py 2006-04-06 06:53:37.317389387 +1000 @@ -91,85 +91,12 @@ class LanguageSupportWindow: def __call__(self, screen, language): - - # should already be sorted - ct = CheckboxTree(height = 8, scroll = 1) - - for lang in language.getAllSupported(): - ct.append(lang, lang, 0) - - for lang in language.getSupported (): - ct.setEntryValue(lang, 1) - - current = language.getDefault() - ct.setCurrent(current) - ct.setEntryValue(current, 1) - - bb = ButtonBar (screen, (TEXT_OK_BUTTON, (_("Select All"), "all"), (_("Reset"), "reset"), TEXT_BACK_BUTTON)) - - message = (_("Choose additional languages that you would like to use " - "on this system:")) - tb = TextboxReflowed(50, message) - - g = GridFormHelp (screen, _("Language Support"), "langsupport", 1, 4) - - g.add (tb, 0, 0, (0, 0, 0, 1), anchorLeft = 1) - g.add (ct, 0, 1, (0, 0, 0, 1)) - g.add (bb, 0, 3, growx = 1) - - while 1: - result = g.run() - - rc = bb.buttonPressed (result) - - if rc == TEXT_BACK_CHECK: - screen.popWindow() - return INSTALL_BACK - - if rc == "all": - for lang in language.getAllSupported(): - ct.setEntryValue(lang, 1) - - if rc == "reset": - for lang in language.getAllSupported(): - if lang == current: - ct.setEntryValue(lang, 1) - else: - ct.setEntryValue(lang, 0) - - if rc == TEXT_OK_CHECK or result == TEXT_F12_CHECK: - # --If they selected all langs, then set language.setSupported to - # None. This installs all langs - - if ct.getSelection() == []: - ButtonChoiceWindow(screen, _("Invalid Choice"), - _("You must select at least one language to install."), - buttons = [ TEXT_OK_BUTTON ], width = 40) - - else: - # set selected langs once - language.setSupported (ct.getSelection()) - - # we may need to reset the default language - default = language.getDefault() - if default not in ct.getSelection(): - sellangs = language.getSupported() - - if len(sellangs) > 0: - language.setDefault(sellangs[0]) - else: - language.setDefault(None) - - else: - language.setDefault(default) - - # now set new selected langs again in case old default - # lang was left in the list before we switched the default - language.setSupported (ct.getSelection()) - - screen.popWindow() - return INSTALL_OK - + langs = [] + default = language.getDefault() + langs.append(default) + language.setSupported(langs) + language.setDefault(default) + return INSTALL_OK class LanguageDefaultWindow: def __call__(self,screen, language): diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/textw/progress_text.py mezzanine_patched_anaconda-10.1.1.37/textw/progress_text.py --- anaconda-10.1.1.37/textw/progress_text.py 2003-10-08 08:05:01.000000000 +1000 +++ mezzanine_patched_anaconda-10.1.1.37/textw/progress_text.py 2006-04-06 06:54:35.803234655 +1000 @@ -103,8 +103,8 @@ currow = 0 - width = 47 + max (len (name), len (size), len (sum)) - self.name = Label(" " * 48) + width = 60 + max (len (name), len (size), len (sum)) + self.name = Label(" " * 59) self.size = Label(" ") detail = Grid(2, 2) detail.setField(Label(name), 0, 0, anchorLeft = 1) diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/textw/timezone_text.py mezzanine_patched_anaconda-10.1.1.37/textw/timezone_text.py --- anaconda-10.1.1.37/textw/timezone_text.py 2004-05-12 08:29:07.000000000 +1000 +++ mezzanine_patched_anaconda-10.1.1.37/textw/timezone_text.py 2006-04-06 06:56:03.241054486 +1000 @@ -48,8 +48,7 @@ args = [ "/usr/sbin/hwclock" ] args.append("--hctosys") - if self.c.selected(): - args.append("--utc") + args.append("--utc") iutil.execWithRedirect(args[0], args) self.g.setTimer(500) @@ -91,14 +90,12 @@ self.l.setCurrent(default) # self.l.setCallback(self.updateClock) - self.c = Checkbox("System clock uses UTC", isOn = asUtc) # self.c.setCallback(self.updateSysClock) self.g = GridFormHelp(screen, _("Time Zone Selection"), "timezone", 1, 5) self.g.add(t, 0, 0) # self.g.add(self.label, 0, 1, padding = (0, 1, 0, 0), anchorLeft = 1) - self.g.add(self.c, 0, 2, padding = (0, 1, 0, 1), anchorLeft = 1) self.g.add(self.l, 0, 3, padding = (0, 0, 0, 1)) self.g.add(bb, 0, 4, growx = 1) @@ -126,7 +123,7 @@ break screen.popWindow() - timezone.setTimezoneInfo(self.l.current(), asUtc = self.c.selected()) + timezone.setTimezoneInfo(self.l.current(), asUtc = 1) return INSTALL_OK diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/textw/upgrade_text.py mezzanine_patched_anaconda-10.1.1.37/textw/upgrade_text.py --- anaconda-10.1.1.37/textw/upgrade_text.py 2004-08-19 02:34:08.000000000 +1000 +++ mezzanine_patched_anaconda-10.1.1.37/textw/upgrade_text.py 2006-04-06 06:59:04.069665851 +1000 @@ -20,8 +20,8 @@ from fsset import * from flags import flags from constants import * -import upgradeclass -UpgradeClass = upgradeclass.InstallClass +import smeupgradeclass +UpgradeClass = smeupgradeclass.InstallClass from rhpl.log import log from rhpl.translate import _ @@ -196,26 +196,19 @@ else: scroll = 0 partList = [] - partList.append(_("Reinstall System")) + partList.append(_("Erase ALL disks, and perform a fresh install")) for (drive, fs, desc) in parts: - if drive[:5] != "/dev/": - devname = "/dev/" + drive - else: - devname = drive - partList.append("%s (%s)" %(desc, drive)) + partList.append(_("Upgrade existing \"%s\" system") %(desc)) (button, choice) = ListboxChoiceWindow(screen, _("System to Upgrade"), - _("One or more existing Linux installations " - "have been found " - "on your system.\n\nPlease choose one to upgrade, " - "or select 'Reinstall System' to freshly install " - "your system."), partList, + _("Your system is upgradeable."), partList, [ TEXT_OK_BUTTON, TEXT_BACK_BUTTON ], width = 55, scroll = scroll, height = height, - help = "upgraderoot") + help = "upgraderoot", + default = 1) if button == TEXT_BACK_CHECK: return INSTALL_BACK diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/upgrade.py mezzanine_patched_anaconda-10.1.1.37/upgrade.py --- anaconda-10.1.1.37/upgrade.py 2006-04-06 06:59:28.387445237 +1000 +++ mezzanine_patched_anaconda-10.1.1.37/upgrade.py 2006-04-06 06:50:27.473356801 +1000 @@ -49,6 +49,21 @@ upgrade_remove_blacklist = ( ("samba","ppc64"),) def findRootParts(intf, id, dispatch, dir, chroot): +# w = intf.waitWindow(_("Converting to RAID"), +# _("Converting to RAID, this may take several minutes...")) +# +# # XXX - FIXME - HACK RAID upgrade +# +# rc = iutil.execWithRedirect("/tmp/updates/raidconvert", +# ["raidconvert"], +# stdin = None, +# stdout = "/dev/tty5", +# stderr = "/dev/tty5") +# w.pop() +# +# if rc: +# raise SystemError + if dir == DISPATCH_BACK: return if id.rootParts is None: @@ -60,7 +75,7 @@ if id.rootParts is not None and len(id.rootParts) > 0: dispatch.skipStep("findinstall", skip = 0) - if productName.find("Red Hat Enterprise Linux") == -1: + if productName.find("SME Server") == -1: dispatch.skipStep("installtype", skip = 1) else: dispatch.skipStep("findinstall", skip = 1) @@ -513,10 +528,10 @@ pass sys.exit(0) - if not os.access(instPath + "/etc/redhat-release", os.R_OK): + if not os.access(instPath + "/etc/e-smith-release", os.R_OK): rc = intf.messageWindow(_("Warning"), _("This system does not have an " - "/etc/redhat-release file. It is possible " + "/etc/e-smith-release file. It is possible " "that this is not a %s system. " "Continuing with the upgrade process may " "leave the system in an unusable state. Do " @@ -533,7 +548,7 @@ # Figure out current version for upgrade nag and for determining weird # upgrade cases supportedUpgradeVersion = -1 - mi = ts.dbMatch('provides', 'redhat-release') + mi = ts.dbMatch('provides', 'e-smith-release') for h in mi: if h[rpm.RPMTAG_EPOCH] is None: epoch = None @@ -541,7 +556,7 @@ epoch = str(h[rpm.RPMTAG_EPOCH]) if supportedUpgradeVersion <= 0: - val = rpm.labelCompare((None, '3', '1'), + val = rpm.labelCompare(('21', '6.0', '11'), (epoch, h[rpm.RPMTAG_VERSION], h[rpm.RPMTAG_RELEASE])) if val > 0: @@ -550,9 +565,6 @@ supportedUpgradeVersion = 1 break - if productName.find("Red Hat Enterprise Linux") == -1: - supportedUpgradeVersion = 1 - if supportedUpgradeVersion == 0: rc = intf.messageWindow(_("Warning"), _("You appear to be upgrading from a system "