--- anaconda-11.1.2.87/textw/progress_text.py.smeserver 2006-05-04 13:58:53.000000000 -0600 +++ anaconda-11.1.2.87/textw/progress_text.py 2007-12-20 13:44:30.000000000 -0700 @@ -108,8 +108,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) --- anaconda-11.1.2.87/textw/timezone_text.py.smeserver 2006-08-16 12:56:48.000000000 -0600 +++ anaconda-11.1.2.87/textw/timezone_text.py 2007-12-20 13:53:29.000000000 -0700 @@ -37,8 +37,7 @@ def updateSysClock(self): args = ["--hctosys"] - if self.c.selected(): - args.append("--utc") + args.append("--utc") iutil.execWithRedirect("hwclock", args, searchPath=1) self.g.setTimer(500) @@ -83,14 +82,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) @@ -118,7 +115,7 @@ break screen.popWindow() - anaconda.id.timezone.setTimezoneInfo(self.l.current(), asUtc = self.c.selected()) + anaconda.id.timezone.setTimezoneInfo(self.l.current(), asUtc = 1) return INSTALL_OK --- 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 2007-12-20 14:23:49.000000000 -0700 @@ -31,88 +31,11 @@ (self.type, self.bootDev) = \ checkbootloader.getBootloaderTypeAndBoot(anaconda.rootPath) - 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 - - if self.type is not None and self.bootDev is not None: - t = TextboxReflowed(53, - _("The installer has detected the %s boot " - "loader currently installed on %s.") - % (self.type, self.bootDev)) - - self.update_radio = blradio.add(_("Update boot loader configuration"), - "update", update) - else: - t = TextboxReflowed(53, - _("The installer is unable to detect the boot loader " - "currently in use on your system.")) - - self.update_radio = blradio.add(_("Update boot loader configuration"), - "update", update) - self.update_radio.w.checkboxSetFlags(FLAG_DISABLED, FLAGS_SET) - - self.nobl_radio = blradio.add(_("Skip boot loader updating"), - "nobl", nobl) - self.newbl_radio = blradio.add(_("Create new boot loader " - "configuration"), - "newbl", newbl) - - buttons = ButtonBar(screen, [TEXT_OK_BUTTON, TEXT_BACK_BUTTON]) - - grid = GridFormHelp(screen, _("Upgrade Boot Loader Configuration"), - "bl-upgrade", 1, 5) - - grid.add(t, 0, 0, (0,0,0,1)) - grid.add(self.update_radio, 0, 1, (0,0,0,0)) - grid.add(self.nobl_radio, 0, 2, (0,0,0,0)) - grid.add(self.newbl_radio, 0, 3, (0,0,0,1)) - grid.add(buttons, 0, 4, growx = 1) - - - while 1: - result = grid.run() - - button = buttons.buttonPressed(result) - - if button == TEXT_BACK_CHECK: - screen.popWindow() - return INSTALL_BACK - - if blradio.getSelection() == "nobl": - self.dispatch.skipStep("bootloadersetup", skip = 1) - self.dispatch.skipStep("bootloader", skip = 1) - self.dispatch.skipStep("bootloaderadvanced", skip = 1) - self.dispatch.skipStep("instbootloader", skip = 1) - elif blradio.getSelection() == "newbl": - self.dispatch.skipStep("bootloadersetup", skip = 0) - self.dispatch.skipStep("bootloader", skip = 0) - self.dispatch.skipStep("bootloaderadvanced", skip = 0) - self.dispatch.skipStep("instbootloader", skip = 0) - self.bl.doUpgradeOnly = 0 - else: - 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 - - if self.type == "GRUB": - self.bl.useGrubVal = 1 - else: - self.bl.useGrubVal = 0 - self.bl.setDevice(self.bootDev) - - - - screen.popWindow() - 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) + return INSTALL_OK --- 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 2007-12-20 13:59:27.000000000 -0700 @@ -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.translate import _ import rhpl @@ -200,26 +200,19 @@ else: scroll = 0 partList = [] - partList.append(_("Reinstall System")) + partList.append(_("Erase ALL disks, and perform a fresh install")) for (drive, fs, desc, label) 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 --- anaconda-11.1.2.87/anaconda.smeserver 2007-08-07 14:45:51.000000000 -0600 +++ anaconda-11.1.2.87/anaconda 2007-12-20 13:01:05.000000000 -0700 @@ -763,6 +763,9 @@ import instdata import floppy + # we don't want to waste time probing + opts.isHeadless = 1 + if not opts.isHeadless: try: import xsetup --- anaconda-11.1.2.87/bootloader.py.smeserver 2006-11-17 13:34:11.000000000 -0700 +++ anaconda-11.1.2.87/bootloader.py 2007-12-20 13:03:25.000000000 -0700 @@ -193,11 +193,6 @@ except bootloaderInfo.BootyNoKernelWarning: if not justConfigFile: w.pop() - if anaconda.intf: - anaconda.intf.messageWindow(_("Warning"), - _("No kernel packages were installed on your " - "system. Your boot loader configuration " - "will not be changed.")) dosync() --- 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 @@ # 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: --- anaconda-11.1.2.87/fsset.py.smeserver 2007-08-23 13:33:10.000000000 -0600 +++ anaconda-11.1.2.87/fsset.py 2007-12-20 13:25:42.000000000 -0700 @@ -1323,7 +1323,6 @@ cf = """ # mdadm.conf written out by anaconda DEVICE partitions -MAILADDR root """ for ent in self.entries: if ent.device.getName() != "RAIDDevice": @@ -1463,6 +1462,7 @@ if bootDev.getName() == "RAIDDevice": ret['boot'] = (bootDev.device, N_("RAID Device")) + ret['mbr'] = (bl.drivelist[0], N_("Master Boot Record (MBR)")) return ret if iutil.getPPCMacGen() == "NewWorld": @@ -1752,6 +1752,10 @@ entry.device.setupDevice(chroot, vgdevice = vg) self.volumesCreated = 1 + def createBootRaid (self, chroot='/'): + bootDev = self.getBootDev() + if bootDev.getDevice().startswith('md'): + bootDev.setupDevice(chroot) def makeFilesystems (self, chroot='/'): formatted = [] @@ -2288,11 +2292,20 @@ self.minor) def raidTab (self, devPrefix='/dev'): + if self.level == 1: + nDisks = max(2, self.numDisks) + elif self.level == 5: + nDisks = max(3, self.numDisks) + elif self.level == 6: + nDisks = max(4, self.numDisks) + else: + nDisks = self.numDisks + entry = "" entry = entry + "raiddev %s/%s\n" % (devPrefix, self.device,) entry = entry + "raid-level %d\n" % (self.level,) - entry = entry + "nr-raid-disks %d\n" % (self.numDisks,) + entry = entry + "nr-raid-disks %d\n" % (nDisks,) entry = entry + "chunk-size %s\n" %(self.chunksize,) entry = entry + "persistent-superblock 1\n" entry = entry + "nr-spare-disks %d\n" % (self.spares,) @@ -2302,6 +2315,10 @@ device) entry = entry + " raid-disk %d\n" % (i,) i = i + 1 + while i < nDisks: + entry = entry + " device dev/null\n" + entry = entry + " failed-disk %d\n" % (i,) + i = i + 1 i = 0 for device in self.members[self.numDisks:]: entry = entry + " device %s/%s\n" % (devPrefix, @@ -2313,6 +2330,15 @@ def setupDevice (self, chroot="/", devPrefix='/dev'): def devify(x): return "/dev/%s" %(x,) + + if self.level == 1: + nDisks = max(2, self.numDisks) + elif self.level == 5: + nDisks = max(3, self.numDisks) + elif self.level == 6: + nDisks = max(4, self.numDisks) + else: + nDisks = self.numDisks node = "%s/%s" % (devPrefix, self.device) isys.makeDevInode(self.device, node) @@ -2326,12 +2352,18 @@ args = ["--create", "/dev/%s" %(self.device,), "--run", "--chunk=%s" %(self.chunksize,), "--level=%s" %(self.level,), - "--raid-devices=%s" %(self.numDisks,)] + "--raid-devices=%s" %(nDisks,)] if self.spares > 0: args.append("--spare-devices=%s" %(self.spares,),) args.extend(map(devify, self.members)) + + i = 0 + while self.numDisks + i < nDisks: + args.append("missing") + i = i + 1 + log.info("going to run: %s" %(["/usr/sbin/mdadm"] + args,)) iutil.execWithRedirect ("/usr/sbin/mdadm", args, stderr="/dev/tty5", stdout="/dev/tty5") --- anaconda-11.1.2.87/instdata.py.smeserver 2007-06-27 12:30:49.000000000 -0600 +++ anaconda-11.1.2.87/instdata.py 2007-12-20 13:28:15.000000000 -0700 @@ -139,8 +139,7 @@ self.instLanguage.write (anaconda.rootPath) - if not self.isHeadless: - self.keyboard.write (anaconda.rootPath) + self.keyboard.write (anaconda.rootPath) self.timezone.write (anaconda.rootPath) @@ -258,8 +257,8 @@ f.write("key %s\n" %(self.instClass.installkey,)) self.instLanguage.writeKS(f) + self.keyboard.writeKS(f) if not self.isHeadless: - self.keyboard.writeKS(f) self.xsetup.writeKS(f, self.desktop, self.ksdata) self.network.writeKS(f) self.zfcp.writeKS(f) --- anaconda-11.1.2.87/kickstart.py.smeserver 2007-06-18 08:30:03.000000000 -0600 +++ anaconda-11.1.2.87/kickstart.py 2007-12-20 13:38:55.000000000 -0700 @@ -764,6 +764,15 @@ w.pop() def postAction(self, anaconda, serial): + win = anaconda.intf.waitWindow(_("Post Install Script"), + _("The post installation script is running...")) + + script = ( "#!/bin/sh\nmkdir -p /var/lib/dhcp; /sbin/syslogd ; sleep 2; /sbin/e-smith/signal-event post-install\n" ) + s = Script(script, interp="/bin/sh", inChroot=1) + log.info("%s", s) + s.run(anaconda.rootPath, serial) + win.pop() + postScripts = filter (lambda s: s.type == KS_SCRIPT_POST, self.ksdata.scripts) --- 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 @@ if not anaconda.id.fsset.isActive(): anaconda.id.diskset.savePartitions () anaconda.id.fsset.checkBadblocks(anaconda.rootPath) + anaconda.id.fsset.createBootRaid(anaconda.rootPath) if not anaconda.id.fsset.volumesCreated: anaconda.id.fsset.createLogicalVolumes(anaconda.rootPath) 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 @@ -550,6 +550,7 @@ return 1 productUpgrades = { + "SME Server": ("Mitel Networks", "SME Server", "CentOS 5"), "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... --- anaconda-11.1.2.87/raid.py.smeserver 2006-10-02 09:01:18.000000000 -0600 +++ anaconda-11.1.2.87/raid.py 2007-12-20 13:47:36.000000000 -0700 @@ -114,7 +114,17 @@ raidList = [] for key in raidSets.keys(): (level, totalDisks, mdMinor, devices) = raidSets[key] - if len(devices) < totalDisks: + if len(devices) == totalDisks - 1 and level in (1, 5, 6): + log.info("missing components of raid device md%d. The " + "raid device needs %d drive(s) and only %d (was/were) found. " + "This raid device will be started in degraded mode.", mdMinor, + totalDisks, len(devices)) + elif len(devices) == totalDisks - 2 and level == 6: + log.info("missing components of raid device md%d. The " + "raid device needs %d drive(s) and only %d (was/were) found. " + "This raid device will be started in degraded mode.", mdMinor, + totalDisks, len(devices)) + elif len(devices) < totalDisks: log.warning("missing components of raid device md%d. The " "raid device needs %d drive(s) and only %d (was/were) " "found. This raid device will not be started.", mdMinor, @@ -168,11 +178,11 @@ if isRaid0(raidlevel): return 2 elif isRaid1(raidlevel): - return 2 + return 1 elif isRaid5(raidlevel): - return 3 + return 2 elif isRaid6(raidlevel): - return 4 + return 2 else: raise ValueError, "invalid raidlevel in get_raid_min_members" --- anaconda-11.1.2.87/text.py.smeserver 2007-03-23 15:24:34.000000000 -0600 +++ anaconda-11.1.2.87/text.py 2007-12-20 13:50:39.000000000 -0700 @@ -583,7 +583,8 @@ "from here. You will have to try " "again."), buttons=[_("OK")]) - anaconda.dispatch.gotoPrev() + else: + anaconda.dispatch.gotoPrev() 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