/[smeserver]/rpms/anaconda/sme8/anaconda-11.1.2.87-smeserver.patch
ViewVC logotype

Contents of /rpms/anaconda/sme8/anaconda-11.1.2.87-smeserver.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.7 - (show annotations) (download)
Mon Mar 17 17:27:41 2008 UTC (16 years, 3 months ago) by slords
Branch: MAIN
Changes since 1.6: +22 -57 lines
Updates

1 --- anaconda-11.1.2.87/textw/progress_text.py.smeserver 2006-05-04 13:58:53.000000000 -0600
2 +++ anaconda-11.1.2.87/textw/progress_text.py 2007-12-20 13:44:30.000000000 -0700
3 @@ -108,8 +108,8 @@
4
5 currow = 0
6
7 - width = 47 + max (len (name), len (size), len (sum))
8 - self.name = Label(" " * 48)
9 + width = 60 + max (len (name), len (size), len (sum))
10 + self.name = Label(" " * 59)
11 self.size = Label(" ")
12 detail = Grid(2, 2)
13 detail.setField(Label(name), 0, 0, anchorLeft = 1)
14 --- anaconda-11.1.2.87/textw/timezone_text.py.smeserver 2006-08-16 12:56:48.000000000 -0600
15 +++ anaconda-11.1.2.87/textw/timezone_text.py 2007-12-20 13:53:29.000000000 -0700
16 @@ -37,8 +37,7 @@
17
18 def updateSysClock(self):
19 args = ["--hctosys"]
20 - if self.c.selected():
21 - args.append("--utc")
22 + args.append("--utc")
23
24 iutil.execWithRedirect("hwclock", args, searchPath=1)
25 self.g.setTimer(500)
26 @@ -83,14 +82,12 @@
27 self.l.setCurrent(default)
28 # self.l.setCallback(self.updateClock)
29
30 - self.c = Checkbox(_("System clock uses UTC"), isOn = asUtc)
31 # self.c.setCallback(self.updateSysClock)
32
33 self.g = GridFormHelp(screen, _("Time Zone Selection"), "timezone",
34 1, 5)
35 self.g.add(t, 0, 0)
36 # self.g.add(self.label, 0, 1, padding = (0, 1, 0, 0), anchorLeft = 1)
37 - self.g.add(self.c, 0, 2, padding = (0, 1, 0, 1), anchorLeft = 1)
38 self.g.add(self.l, 0, 3, padding = (0, 0, 0, 1))
39 self.g.add(bb, 0, 4, growx = 1)
40
41 @@ -118,7 +115,7 @@
42 break
43
44 screen.popWindow()
45 - anaconda.id.timezone.setTimezoneInfo(self.l.current(), asUtc = self.c.selected())
46 + anaconda.id.timezone.setTimezoneInfo(self.l.current(), asUtc = 1)
47
48 return INSTALL_OK
49
50 --- anaconda-11.1.2.87/textw/upgrade_bootloader_text.py.smeserver 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
52 @@ -31,88 +31,11 @@
53 (self.type, self.bootDev) = \
54 checkbootloader.getBootloaderTypeAndBoot(anaconda.rootPath)
55
56 - blradio = RadioGroup()
57 -
58 - (update, newbl, nobl) = (0, 0, 0)
59 - if not self.dispatch.stepInSkipList("bootloader"):
60 - newbl = 1
61 - elif self.dispatch.stepInSkipList("instbootloader"):
62 - nobl = 1
63 - else:
64 - if self.type is not None and self.bootDev is not None:
65 - update = 1
66 - else:
67 - nobl = 1
68 -
69 - if self.type is not None and self.bootDev is not None:
70 - t = TextboxReflowed(53,
71 - _("The installer has detected the %s boot "
72 - "loader currently installed on %s.")
73 - % (self.type, self.bootDev))
74 -
75 - self.update_radio = blradio.add(_("Update boot loader configuration"),
76 - "update", update)
77 - else:
78 - t = TextboxReflowed(53,
79 - _("The installer is unable to detect the boot loader "
80 - "currently in use on your system."))
81 -
82 - self.update_radio = blradio.add(_("Update boot loader configuration"),
83 - "update", update)
84 - self.update_radio.w.checkboxSetFlags(FLAG_DISABLED, FLAGS_SET)
85 -
86 - self.nobl_radio = blradio.add(_("Skip boot loader updating"),
87 - "nobl", nobl)
88 - self.newbl_radio = blradio.add(_("Create new boot loader "
89 - "configuration"),
90 - "newbl", newbl)
91 -
92 - buttons = ButtonBar(screen, [TEXT_OK_BUTTON, TEXT_BACK_BUTTON])
93 -
94 - grid = GridFormHelp(screen, _("Upgrade Boot Loader Configuration"),
95 - "bl-upgrade", 1, 5)
96 -
97 - grid.add(t, 0, 0, (0,0,0,1))
98 - grid.add(self.update_radio, 0, 1, (0,0,0,0))
99 - grid.add(self.nobl_radio, 0, 2, (0,0,0,0))
100 - grid.add(self.newbl_radio, 0, 3, (0,0,0,1))
101 - grid.add(buttons, 0, 4, growx = 1)
102 -
103 -
104 - while 1:
105 - result = grid.run()
106 -
107 - button = buttons.buttonPressed(result)
108 -
109 - if button == TEXT_BACK_CHECK:
110 - screen.popWindow()
111 - return INSTALL_BACK
112 -
113 - if blradio.getSelection() == "nobl":
114 - self.dispatch.skipStep("bootloadersetup", skip = 1)
115 - self.dispatch.skipStep("bootloader", skip = 1)
116 - self.dispatch.skipStep("bootloaderadvanced", skip = 1)
117 - self.dispatch.skipStep("instbootloader", skip = 1)
118 - elif blradio.getSelection() == "newbl":
119 - self.dispatch.skipStep("bootloadersetup", skip = 0)
120 - self.dispatch.skipStep("bootloader", skip = 0)
121 - self.dispatch.skipStep("bootloaderadvanced", skip = 0)
122 - self.dispatch.skipStep("instbootloader", skip = 0)
123 - self.bl.doUpgradeOnly = 0
124 - else:
125 - self.dispatch.skipStep("bootloadersetup", skip = 0)
126 - self.dispatch.skipStep("bootloader", skip = 1)
127 - self.dispatch.skipStep("bootloaderadvanced", skip = 1)
128 - self.dispatch.skipStep("instbootloader", skip = 0)
129 - self.bl.doUpgradeOnly = 1
130 -
131 - if self.type == "GRUB":
132 - self.bl.useGrubVal = 1
133 - else:
134 - self.bl.useGrubVal = 0
135 - self.bl.setDevice(self.bootDev)
136 -
137 -
138 -
139 - screen.popWindow()
140 - return INSTALL_OK
141 + self.dispatch.skipStep("bootloadersetup", skip = 0)
142 + self.dispatch.skipStep("bootloader", skip = 1)
143 + self.dispatch.skipStep("bootloaderadvanced", skip = 1)
144 + self.dispatch.skipStep("instbootloader", skip = 0)
145 + self.bl.doUpgradeOnly = 1
146 + self.bl.useGrubVal = 1
147 + self.bl.setDevice(self.bootDev)
148 + return INSTALL_OK
149 --- anaconda-11.1.2.87/textw/upgrade_text.py.smeserver 2007-01-22 16:14:06.000000000 -0700
150 +++ anaconda-11.1.2.87/textw/upgrade_text.py 2007-12-20 13:59:27.000000000 -0700
151 @@ -20,8 +20,8 @@
152 from fsset import *
153 from flags import flags
154 from constants import *
155 -import upgradeclass
156 -UpgradeClass = upgradeclass.InstallClass
157 +import smeupgradeclass
158 +UpgradeClass = smeupgradeclass.InstallClass
159
160 from rhpl.translate import _
161 import rhpl
162 @@ -200,26 +200,19 @@
163 else:
164 scroll = 0
165 partList = []
166 - partList.append(_("Reinstall System"))
167 + partList.append(_("Erase ALL disks, and perform a fresh install"))
168
169 for (drive, fs, desc, label) in parts:
170 - if drive[:5] != "/dev/":
171 - devname = "/dev/" + drive
172 - else:
173 - devname = drive
174 - partList.append("%s (%s)" %(desc, drive))
175 + partList.append("Upgrade existing \"%s\" system" %(desc))
176
177 (button, choice) = ListboxChoiceWindow(screen, _("System to Upgrade"),
178 - _("One or more existing Linux installations "
179 - "have been found "
180 - "on your system.\n\nPlease choose one to upgrade, "
181 - "or select 'Reinstall System' to freshly install "
182 - "your system."), partList,
183 + _("Your system is upgradeable."), partList,
184 [ TEXT_OK_BUTTON,
185 TEXT_BACK_BUTTON ],
186 width = 55, scroll = scroll,
187 height = height,
188 - help = "upgraderoot")
189 + help = "upgraderoot",
190 + default = 1)
191
192 if button == TEXT_BACK_CHECK:
193 return INSTALL_BACK
194 --- anaconda-11.1.2.87/anaconda.smeserver 2007-08-07 14:45:51.000000000 -0600
195 +++ anaconda-11.1.2.87/anaconda 2007-12-20 13:01:05.000000000 -0700
196 @@ -763,6 +763,9 @@
197 import instdata
198 import floppy
199
200 + # we don't want to waste time probing
201 + opts.isHeadless = 1
202 +
203 if not opts.isHeadless:
204 try:
205 import xsetup
206 --- anaconda-11.1.2.87/bootloader.py.smeserver 2006-11-17 13:34:11.000000000 -0700
207 +++ anaconda-11.1.2.87/bootloader.py 2007-12-20 13:03:25.000000000 -0700
208 @@ -193,11 +193,6 @@
209 except bootloaderInfo.BootyNoKernelWarning:
210 if not justConfigFile:
211 w.pop()
212 - if anaconda.intf:
213 - anaconda.intf.messageWindow(_("Warning"),
214 - _("No kernel packages were installed on your "
215 - "system. Your boot loader configuration "
216 - "will not be changed."))
217
218 dosync()
219
220 --- anaconda-11.1.2.87/findpackageset.py.smeserver 2005-02-08 07:37:30.000000000 -0700
221 +++ anaconda-11.1.2.87/findpackageset.py 2007-12-20 13:05:57.000000000 -0700
222 @@ -108,21 +108,15 @@
223 # loop through packages and find ones which are a newer
224 # version than what we have
225 for ( name, arch ) in instDict.keys():
226 - if ( name, arch ) in availDict.keys():
227 - # Exact arch upgrade
228 - h = instDict[(name, arch)]
229 - pkg = availDict[(name,arch)]
230 - comparePackageForUpgrade(updDict, h, pkg)
231 - else:
232 - # See if we have a better arch than that installed
233 - if name in availNames.keys():
234 - bestarch = findBestArch(availNames[name])
235 - if not bestarch:
236 - continue
237 - if availDict.has_key((name,bestarch)):
238 - h = instDict[(name,arch)]
239 - pkg = availDict[(name,bestarch)]
240 - comparePackageForUpgrade(updDict, h, pkg)
241 + # See if we have a better arch than that installed
242 + if name in availNames.keys():
243 + bestarch = findBestArch(availNames[name])
244 + if not bestarch:
245 + continue
246 + if availDict.has_key((name,bestarch)):
247 + h = instDict[(name,arch)]
248 + pkg = availDict[(name,bestarch)]
249 + comparePackageForUpgrade(updDict, h, pkg)
250
251 # handle obsoletes
252 for pkg in hdlist:
253 --- anaconda-11.1.2.87/fsset.py.smeserver 2007-08-23 13:33:10.000000000 -0600
254 +++ anaconda-11.1.2.87/fsset.py 2007-12-20 13:25:42.000000000 -0700
255 @@ -1323,7 +1323,6 @@
256 cf = """
257 # mdadm.conf written out by anaconda
258 DEVICE partitions
259 -MAILADDR root
260 """
261 for ent in self.entries:
262 if ent.device.getName() != "RAIDDevice":
263 @@ -1463,6 +1462,7 @@
264
265 if bootDev.getName() == "RAIDDevice":
266 ret['boot'] = (bootDev.device, N_("RAID Device"))
267 + ret['mbr'] = (bl.drivelist[0], N_("Master Boot Record (MBR)"))
268 return ret
269
270 if iutil.getPPCMacGen() == "NewWorld":
271 @@ -1752,6 +1752,10 @@
272 entry.device.setupDevice(chroot, vgdevice = vg)
273 self.volumesCreated = 1
274
275 + def createBootRaid (self, chroot='/'):
276 + bootDev = self.getBootDev()
277 + if bootDev.getDevice().startswith('md'):
278 + bootDev.setupDevice(chroot)
279
280 def makeFilesystems (self, chroot='/'):
281 formatted = []
282 @@ -2288,11 +2292,20 @@
283 self.minor)
284
285 def raidTab (self, devPrefix='/dev'):
286 + if self.level == 1:
287 + nDisks = max(2, self.numDisks)
288 + elif self.level == 5:
289 + nDisks = max(3, self.numDisks)
290 + elif self.level == 6:
291 + nDisks = max(4, self.numDisks)
292 + else:
293 + nDisks = self.numDisks
294 +
295 entry = ""
296 entry = entry + "raiddev %s/%s\n" % (devPrefix,
297 self.device,)
298 entry = entry + "raid-level %d\n" % (self.level,)
299 - entry = entry + "nr-raid-disks %d\n" % (self.numDisks,)
300 + entry = entry + "nr-raid-disks %d\n" % (nDisks,)
301 entry = entry + "chunk-size %s\n" %(self.chunksize,)
302 entry = entry + "persistent-superblock 1\n"
303 entry = entry + "nr-spare-disks %d\n" % (self.spares,)
304 @@ -2302,6 +2315,10 @@
305 device)
306 entry = entry + " raid-disk %d\n" % (i,)
307 i = i + 1
308 + while i < nDisks:
309 + entry = entry + " device dev/null\n"
310 + entry = entry + " failed-disk %d\n" % (i,)
311 + i = i + 1
312 i = 0
313 for device in self.members[self.numDisks:]:
314 entry = entry + " device %s/%s\n" % (devPrefix,
315 @@ -2313,6 +2330,15 @@
316 def setupDevice (self, chroot="/", devPrefix='/dev'):
317 def devify(x):
318 return "/dev/%s" %(x,)
319 +
320 + if self.level == 1:
321 + nDisks = max(2, self.numDisks)
322 + elif self.level == 5:
323 + nDisks = max(3, self.numDisks)
324 + elif self.level == 6:
325 + nDisks = max(4, self.numDisks)
326 + else:
327 + nDisks = self.numDisks
328
329 node = "%s/%s" % (devPrefix, self.device)
330 isys.makeDevInode(self.device, node)
331 @@ -2326,12 +2352,18 @@
332 args = ["--create", "/dev/%s" %(self.device,),
333 "--run", "--chunk=%s" %(self.chunksize,),
334 "--level=%s" %(self.level,),
335 - "--raid-devices=%s" %(self.numDisks,)]
336 + "--raid-devices=%s" %(nDisks,)]
337
338 if self.spares > 0:
339 args.append("--spare-devices=%s" %(self.spares,),)
340
341 args.extend(map(devify, self.members))
342 +
343 + i = 0
344 + while self.numDisks + i < nDisks:
345 + args.append("missing")
346 + i = i + 1
347 +
348 log.info("going to run: %s" %(["/usr/sbin/mdadm"] + args,))
349 iutil.execWithRedirect ("/usr/sbin/mdadm", args,
350 stderr="/dev/tty5", stdout="/dev/tty5")
351 --- anaconda-11.1.2.87/instdata.py.smeserver 2007-06-27 12:30:49.000000000 -0600
352 +++ anaconda-11.1.2.87/instdata.py 2007-12-20 13:28:15.000000000 -0700
353 @@ -139,8 +139,7 @@
354
355 self.instLanguage.write (anaconda.rootPath)
356
357 - if not self.isHeadless:
358 - self.keyboard.write (anaconda.rootPath)
359 + self.keyboard.write (anaconda.rootPath)
360
361 self.timezone.write (anaconda.rootPath)
362
363 @@ -258,8 +257,8 @@
364 f.write("key %s\n" %(self.instClass.installkey,))
365
366 self.instLanguage.writeKS(f)
367 + self.keyboard.writeKS(f)
368 if not self.isHeadless:
369 - self.keyboard.writeKS(f)
370 self.xsetup.writeKS(f, self.desktop, self.ksdata)
371 self.network.writeKS(f)
372 self.zfcp.writeKS(f)
373 --- anaconda-11.1.2.87/kickstart.py.smeserver 2007-06-18 08:30:03.000000000 -0600
374 +++ anaconda-11.1.2.87/kickstart.py 2007-12-20 13:38:55.000000000 -0700
375 @@ -764,6 +764,15 @@
376 w.pop()
377
378 def postAction(self, anaconda, serial):
379 + win = anaconda.intf.waitWindow(_("Post Install Script"),
380 + _("The post installation script is running..."))
381 +
382 + script = ( "#!/bin/sh\nmkdir -p /var/lib/dhcp; /sbin/syslogd ; sleep 2; /sbin/e-smith/signal-event post-install\n" )
383 + s = Script(script, interp="/bin/sh", inChroot=1)
384 + log.info("%s", s)
385 + s.run(anaconda.rootPath, serial)
386 + win.pop()
387 +
388 postScripts = filter (lambda s: s.type == KS_SCRIPT_POST,
389 self.ksdata.scripts)
390
391 --- anaconda-11.1.2.87/packages.py.smeserver 2007-12-20 13:41:11.000000000 -0700
392 +++ anaconda-11.1.2.87/packages.py 2007-12-20 13:40:41.000000000 -0700
393 @@ -146,6 +146,7 @@
394 if not anaconda.id.fsset.isActive():
395 anaconda.id.diskset.savePartitions ()
396 anaconda.id.fsset.checkBadblocks(anaconda.rootPath)
397 + anaconda.id.fsset.createBootRaid(anaconda.rootPath)
398 if not anaconda.id.fsset.volumesCreated:
399 anaconda.id.fsset.createLogicalVolumes(anaconda.rootPath)
400 anaconda.id.fsset.formatSwap(anaconda.rootPath)
401 --- anaconda-11.1.2.87/partedUtils.py.smeserver 2007-07-12 10:16:05.000000000 -0600
402 +++ anaconda-11.1.2.87/partedUtils.py 2007-12-20 13:43:33.000000000 -0700
403 @@ -550,6 +550,7 @@
404 return 1
405
406 productUpgrades = {
407 + "SME Server": ("Mitel Networks", "SME Server", "CentOS 5"),
408 "Red Hat Enterprise Linux AS": ("Red Hat Linux Advanced Server", ),
409 "Red Hat Enterprise Linux WS": ("Red Hat Linux Advanced Workstation",),
410 # FIXME: this probably shouldn't be in a release...
411 --- anaconda-11.1.2.87/raid.py.smeserver 2006-10-02 09:01:18.000000000 -0600
412 +++ anaconda-11.1.2.87/raid.py 2007-12-20 13:47:36.000000000 -0700
413 @@ -114,7 +114,17 @@
414 raidList = []
415 for key in raidSets.keys():
416 (level, totalDisks, mdMinor, devices) = raidSets[key]
417 - if len(devices) < totalDisks:
418 + if len(devices) == totalDisks - 1 and level in (1, 5, 6):
419 + log.info("missing components of raid device md%d. The "
420 + "raid device needs %d drive(s) and only %d (was/were) found. "
421 + "This raid device will be started in degraded mode.", mdMinor,
422 + totalDisks, len(devices))
423 + elif len(devices) == totalDisks - 2 and level == 6:
424 + log.info("missing components of raid device md%d. The "
425 + "raid device needs %d drive(s) and only %d (was/were) found. "
426 + "This raid device will be started in degraded mode.", mdMinor,
427 + totalDisks, len(devices))
428 + elif len(devices) < totalDisks:
429 log.warning("missing components of raid device md%d. The "
430 "raid device needs %d drive(s) and only %d (was/were) "
431 "found. This raid device will not be started.", mdMinor,
432 @@ -168,11 +178,11 @@
433 if isRaid0(raidlevel):
434 return 2
435 elif isRaid1(raidlevel):
436 - return 2
437 + return 1
438 elif isRaid5(raidlevel):
439 - return 3
440 + return 2
441 elif isRaid6(raidlevel):
442 - return 4
443 + return 2
444 else:
445 raise ValueError, "invalid raidlevel in get_raid_min_members"
446
447 --- anaconda-11.1.2.87/text.py.smeserver 2007-03-23 15:24:34.000000000 -0600
448 +++ anaconda-11.1.2.87/text.py 2007-12-20 13:50:39.000000000 -0700
449 @@ -583,7 +583,8 @@
450 "from here. You will have to try "
451 "again."),
452 buttons=[_("OK")])
453 - anaconda.dispatch.gotoPrev()
454 + else:
455 + anaconda.dispatch.gotoPrev()
456 else:
457 anaconda.dispatch.gotoNext()
458
459 --- anaconda-11.1.2.87/yuminstall.py.sme 2007-09-11 11:51:21.000000000 -0600
460 +++ anaconda-11.1.2.87/yuminstall.py 2008-03-17 08:01:27.000000000 -0600
461 @@ -1083,7 +1083,8 @@
462
463 if foundModule == 1:
464 for (n, arch, tag) in kernelVersions:
465 - recreateInitrd(n, anaconda.rootPath)
466 + if os.access("/boot/System.map-%s" %(n,), os.X_OK):
467 + recreateInitrd(n, anaconda.rootPath)
468
469 def selectBestKernel(self, anaconda):
470 """Find the best kernel package which is available and select it."""
471 @@ -1729,7 +1730,8 @@
472 # to the old method.
473 if len(self._installedDriverModules) == len(anaconda.id.extraModules):
474 for (n, arch, tag) in self.kernelVersionList():
475 - recreateInitrd(n, anaconda.rootPath)
476 + if os.access("/boot/System.map-%s" %(n,), os.X_OK):
477 + recreateInitrd(n, anaconda.rootPath)
478 else:
479 modulesList = filter(lambda m: m not in self._installedDriverModules, anaconda.id.extraModules)
480 self.copyExtraModules(anaconda, modulesList)

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed