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

Annotation 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.11 - (hide annotations) (download)
Mon Mar 31 19:16:05 2008 UTC (16 years, 7 months ago) by slords
Branch: MAIN
Changes since 1.10: +26 -28 lines 
Fix bootloader updates
1 slords 1.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 slords 1.11 --- 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 2008-03-31 13:13:42.000000000 -0600
52     @@ -44,75 +44,24 @@
53     else:
54     nobl = 1
55    
56 slords 1.1 - if self.type is not None and self.bootDev is not None:
57     - t = TextboxReflowed(53,
58     - _("The installer has detected the %s boot "
59     - "loader currently installed on %s.")
60     - % (self.type, self.bootDev))
61     -
62     - self.update_radio = blradio.add(_("Update boot loader configuration"),
63     - "update", update)
64 slords 1.11 + 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 slords 1.1 - t = TextboxReflowed(53,
77     - _("The installer is unable to detect the boot loader "
78     - "currently in use on your system."))
79     -
80     - self.update_radio = blradio.add(_("Update boot loader configuration"),
81     - "update", update)
82     - self.update_radio.w.checkboxSetFlags(FLAG_DISABLED, FLAGS_SET)
83     -
84     - self.nobl_radio = blradio.add(_("Skip boot loader updating"),
85     - "nobl", nobl)
86     - self.newbl_radio = blradio.add(_("Create new boot loader "
87     - "configuration"),
88     - "newbl", newbl)
89     -
90     - buttons = ButtonBar(screen, [TEXT_OK_BUTTON, TEXT_BACK_BUTTON])
91     -
92     - grid = GridFormHelp(screen, _("Upgrade Boot Loader Configuration"),
93     - "bl-upgrade", 1, 5)
94     -
95     - grid.add(t, 0, 0, (0,0,0,1))
96     - grid.add(self.update_radio, 0, 1, (0,0,0,0))
97     - grid.add(self.nobl_radio, 0, 2, (0,0,0,0))
98     - grid.add(self.newbl_radio, 0, 3, (0,0,0,1))
99     - grid.add(buttons, 0, 4, growx = 1)
100     -
101     -
102     - while 1:
103     - result = grid.run()
104     -
105     - button = buttons.buttonPressed(result)
106     -
107     - if button == TEXT_BACK_CHECK:
108     - screen.popWindow()
109     - return INSTALL_BACK
110     -
111     - if blradio.getSelection() == "nobl":
112     - self.dispatch.skipStep("bootloadersetup", skip = 1)
113     - self.dispatch.skipStep("bootloader", skip = 1)
114     - self.dispatch.skipStep("bootloaderadvanced", skip = 1)
115     - self.dispatch.skipStep("instbootloader", skip = 1)
116     - elif blradio.getSelection() == "newbl":
117     - self.dispatch.skipStep("bootloadersetup", skip = 0)
118     - self.dispatch.skipStep("bootloader", skip = 0)
119     - self.dispatch.skipStep("bootloaderadvanced", skip = 0)
120     - self.dispatch.skipStep("instbootloader", skip = 0)
121     - self.bl.doUpgradeOnly = 0
122     - else:
123     - self.dispatch.skipStep("bootloadersetup", skip = 0)
124     - self.dispatch.skipStep("bootloader", skip = 1)
125     - self.dispatch.skipStep("bootloaderadvanced", skip = 1)
126     - self.dispatch.skipStep("instbootloader", skip = 0)
127     - self.bl.doUpgradeOnly = 1
128     -
129     - if self.type == "GRUB":
130     - self.bl.useGrubVal = 1
131     - else:
132     - self.bl.useGrubVal = 0
133     - self.bl.setDevice(self.bootDev)
134     -
135     -
136 slords 1.11 + 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 slords 1.1 - screen.popWindow()
145     - return INSTALL_OK
146     + return INSTALL_OK
147     --- 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
149     @@ -20,8 +20,8 @@
150     from fsset import *
151     from flags import flags
152     from constants import *
153     -import upgradeclass
154     -UpgradeClass = upgradeclass.InstallClass
155     +import smeupgradeclass
156     +UpgradeClass = smeupgradeclass.InstallClass
157    
158     from rhpl.translate import _
159     import rhpl
160     @@ -200,26 +200,19 @@
161     else:
162     scroll = 0
163     partList = []
164     - partList.append(_("Reinstall System"))
165     + partList.append(_("Erase ALL disks, and perform a fresh install"))
166    
167     for (drive, fs, desc, label) in parts:
168     - if drive[:5] != "/dev/":
169     - devname = "/dev/" + drive
170     - else:
171     - devname = drive
172     - partList.append("%s (%s)" %(desc, drive))
173 slords 1.8 + partList.append(_("Upgrade existing \"%s\" system") %(desc))
174 slords 1.1
175     (button, choice) = ListboxChoiceWindow(screen, _("System to Upgrade"),
176     - _("One or more existing Linux installations "
177     - "have been found "
178     - "on your system.\n\nPlease choose one to upgrade, "
179     - "or select 'Reinstall System' to freshly install "
180     - "your system."), partList,
181     + _("Your system is upgradeable."), partList,
182     [ TEXT_OK_BUTTON,
183     TEXT_BACK_BUTTON ],
184     width = 55, scroll = scroll,
185     height = height,
186     - help = "upgraderoot")
187     + help = "upgraderoot",
188     + default = 1)
189    
190     if button == TEXT_BACK_CHECK:
191     return INSTALL_BACK
192     --- anaconda-11.1.2.87/anaconda.smeserver 2007-08-07 14:45:51.000000000 -0600
193     +++ anaconda-11.1.2.87/anaconda 2007-12-20 13:01:05.000000000 -0700
194     @@ -763,6 +763,9 @@
195     import instdata
196     import floppy
197    
198     + # we don't want to waste time probing
199     + opts.isHeadless = 1
200     +
201     if not opts.isHeadless:
202     try:
203     import xsetup
204     --- anaconda-11.1.2.87/bootloader.py.smeserver 2006-11-17 13:34:11.000000000 -0700
205     +++ anaconda-11.1.2.87/bootloader.py 2007-12-20 13:03:25.000000000 -0700
206     @@ -193,11 +193,6 @@
207     except bootloaderInfo.BootyNoKernelWarning:
208     if not justConfigFile:
209     w.pop()
210     - if anaconda.intf:
211     - anaconda.intf.messageWindow(_("Warning"),
212     - _("No kernel packages were installed on your "
213     - "system. Your boot loader configuration "
214     - "will not be changed."))
215    
216     dosync()
217    
218     --- anaconda-11.1.2.87/findpackageset.py.smeserver 2005-02-08 07:37:30.000000000 -0700
219     +++ anaconda-11.1.2.87/findpackageset.py 2007-12-20 13:05:57.000000000 -0700
220     @@ -108,21 +108,15 @@
221     # loop through packages and find ones which are a newer
222     # version than what we have
223     for ( name, arch ) in instDict.keys():
224     - if ( name, arch ) in availDict.keys():
225     - # Exact arch upgrade
226     - h = instDict[(name, arch)]
227     - pkg = availDict[(name,arch)]
228     - comparePackageForUpgrade(updDict, h, pkg)
229     - else:
230     - # See if we have a better arch than that installed
231     - if name in availNames.keys():
232     - bestarch = findBestArch(availNames[name])
233     - if not bestarch:
234     - continue
235     - if availDict.has_key((name,bestarch)):
236     - h = instDict[(name,arch)]
237     - pkg = availDict[(name,bestarch)]
238     - comparePackageForUpgrade(updDict, h, pkg)
239     + # See if we have a better arch than that installed
240     + if name in availNames.keys():
241     + bestarch = findBestArch(availNames[name])
242     + if not bestarch:
243     + continue
244     + if availDict.has_key((name,bestarch)):
245     + h = instDict[(name,arch)]
246     + pkg = availDict[(name,bestarch)]
247     + comparePackageForUpgrade(updDict, h, pkg)
248    
249     # handle obsoletes
250     for pkg in hdlist:
251     --- anaconda-11.1.2.87/fsset.py.smeserver 2007-08-23 13:33:10.000000000 -0600
252     +++ anaconda-11.1.2.87/fsset.py 2007-12-20 13:25:42.000000000 -0700
253     @@ -1323,7 +1323,6 @@
254     cf = """
255     # mdadm.conf written out by anaconda
256     DEVICE partitions
257     -MAILADDR root
258     """
259     for ent in self.entries:
260     if ent.device.getName() != "RAIDDevice":
261     @@ -1463,6 +1462,7 @@
262    
263     if bootDev.getName() == "RAIDDevice":
264     ret['boot'] = (bootDev.device, N_("RAID Device"))
265     + ret['mbr'] = (bl.drivelist[0], N_("Master Boot Record (MBR)"))
266     return ret
267    
268     if iutil.getPPCMacGen() == "NewWorld":
269     @@ -1752,6 +1752,10 @@
270     entry.device.setupDevice(chroot, vgdevice = vg)
271     self.volumesCreated = 1
272    
273     + def createBootRaid (self, chroot='/'):
274     + bootDev = self.getBootDev()
275     + if bootDev.getDevice().startswith('md'):
276     + bootDev.setupDevice(chroot)
277    
278     def makeFilesystems (self, chroot='/'):
279     formatted = []
280     @@ -2288,11 +2292,20 @@
281     self.minor)
282    
283     def raidTab (self, devPrefix='/dev'):
284     + if self.level == 1:
285     + nDisks = max(2, self.numDisks)
286     + elif self.level == 5:
287     + nDisks = max(3, self.numDisks)
288     + elif self.level == 6:
289     + nDisks = max(4, self.numDisks)
290     + else:
291     + nDisks = self.numDisks
292     +
293     entry = ""
294     entry = entry + "raiddev %s/%s\n" % (devPrefix,
295     self.device,)
296     entry = entry + "raid-level %d\n" % (self.level,)
297     - entry = entry + "nr-raid-disks %d\n" % (self.numDisks,)
298     + entry = entry + "nr-raid-disks %d\n" % (nDisks,)
299     entry = entry + "chunk-size %s\n" %(self.chunksize,)
300     entry = entry + "persistent-superblock 1\n"
301     entry = entry + "nr-spare-disks %d\n" % (self.spares,)
302     @@ -2302,6 +2315,10 @@
303     device)
304     entry = entry + " raid-disk %d\n" % (i,)
305     i = i + 1
306     + while i < nDisks:
307     + entry = entry + " device dev/null\n"
308     + entry = entry + " failed-disk %d\n" % (i,)
309     + i = i + 1
310     i = 0
311     for device in self.members[self.numDisks:]:
312     entry = entry + " device %s/%s\n" % (devPrefix,
313     @@ -2313,6 +2330,15 @@
314     def setupDevice (self, chroot="/", devPrefix='/dev'):
315     def devify(x):
316     return "/dev/%s" %(x,)
317     +
318     + if self.level == 1:
319     + nDisks = max(2, self.numDisks)
320     + elif self.level == 5:
321     + nDisks = max(3, self.numDisks)
322     + elif self.level == 6:
323     + nDisks = max(4, self.numDisks)
324     + else:
325     + nDisks = self.numDisks
326    
327     node = "%s/%s" % (devPrefix, self.device)
328     isys.makeDevInode(self.device, node)
329     @@ -2326,12 +2352,18 @@
330     args = ["--create", "/dev/%s" %(self.device,),
331     "--run", "--chunk=%s" %(self.chunksize,),
332     "--level=%s" %(self.level,),
333     - "--raid-devices=%s" %(self.numDisks,)]
334     + "--raid-devices=%s" %(nDisks,)]
335    
336     if self.spares > 0:
337     args.append("--spare-devices=%s" %(self.spares,),)
338    
339     args.extend(map(devify, self.members))
340     +
341     + i = 0
342     + while self.numDisks + i < nDisks:
343     + args.append("missing")
344     + i = i + 1
345     +
346     log.info("going to run: %s" %(["/usr/sbin/mdadm"] + args,))
347     iutil.execWithRedirect ("/usr/sbin/mdadm", args,
348     stderr="/dev/tty5", stdout="/dev/tty5")
349     --- anaconda-11.1.2.87/instdata.py.smeserver 2007-06-27 12:30:49.000000000 -0600
350     +++ anaconda-11.1.2.87/instdata.py 2007-12-20 13:28:15.000000000 -0700
351     @@ -139,8 +139,7 @@
352    
353     self.instLanguage.write (anaconda.rootPath)
354    
355     - if not self.isHeadless:
356     - self.keyboard.write (anaconda.rootPath)
357     + self.keyboard.write (anaconda.rootPath)
358    
359     self.timezone.write (anaconda.rootPath)
360    
361     @@ -258,8 +257,8 @@
362     f.write("key %s\n" %(self.instClass.installkey,))
363    
364     self.instLanguage.writeKS(f)
365     + self.keyboard.writeKS(f)
366     if not self.isHeadless:
367     - self.keyboard.writeKS(f)
368     self.xsetup.writeKS(f, self.desktop, self.ksdata)
369     self.network.writeKS(f)
370     self.zfcp.writeKS(f)
371     --- anaconda-11.1.2.87/kickstart.py.smeserver 2007-06-18 08:30:03.000000000 -0600
372     +++ anaconda-11.1.2.87/kickstart.py 2007-12-20 13:38:55.000000000 -0700
373 slords 1.3 @@ -764,6 +764,15 @@
374 slords 1.1 w.pop()
375    
376     def postAction(self, anaconda, serial):
377     + win = anaconda.intf.waitWindow(_("Post Install Script"),
378     + _("The post installation script is running..."))
379     +
380 slords 1.4 + script = ( "#!/bin/sh\nmkdir -p /var/lib/dhcp; /sbin/syslogd ; sleep 2; /sbin/e-smith/signal-event post-install\n" )
381 slords 1.1 + s = Script(script, interp="/bin/sh", inChroot=1)
382     + log.info("%s", s)
383     + s.run(anaconda.rootPath, serial)
384     + win.pop()
385     +
386     postScripts = filter (lambda s: s.type == KS_SCRIPT_POST,
387     self.ksdata.scripts)
388    
389 slords 1.10 --- anaconda-11.1.2.87/lang-table.smeserver 2006-12-04 13:31:57.000000000 -0700
390 slords 1.9 +++ 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 slords 1.10 --- anaconda-11.1.2.87/language.py.smeserver 2006-10-10 11:18:09.000000000 -0600
447 slords 1.9 +++ 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 slords 1.10 + '/mnt/source/RHupdates/lang-names',
455 slords 1.9 + '/usr/lib/anaconda/lang-names')
456     for path in search:
457     if os.access(path, os.R_OK):
458     f = open(path, 'r')
459 slords 1.10 @@ -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 slords 1.1 --- 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
470     @@ -146,6 +146,7 @@
471     if not anaconda.id.fsset.isActive():
472     anaconda.id.diskset.savePartitions ()
473     anaconda.id.fsset.checkBadblocks(anaconda.rootPath)
474     + anaconda.id.fsset.createBootRaid(anaconda.rootPath)
475     if not anaconda.id.fsset.volumesCreated:
476     anaconda.id.fsset.createLogicalVolumes(anaconda.rootPath)
477     anaconda.id.fsset.formatSwap(anaconda.rootPath)
478     --- 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
480 slords 1.9 @@ -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 slords 1.1 @@ -550,6 +550,7 @@
492     return 1
493    
494     productUpgrades = {
495 slords 1.9 + "SME Server": ("Mitel Networks", "SME Server"),
496 slords 1.1 "Red Hat Enterprise Linux AS": ("Red Hat Linux Advanced Server", ),
497     "Red Hat Enterprise Linux WS": ("Red Hat Linux Advanced Workstation",),
498     # FIXME: this probably shouldn't be in a release...
499     --- anaconda-11.1.2.87/raid.py.smeserver 2006-10-02 09:01:18.000000000 -0600
500     +++ anaconda-11.1.2.87/raid.py 2007-12-20 13:47:36.000000000 -0700
501     @@ -114,7 +114,17 @@
502     raidList = []
503     for key in raidSets.keys():
504     (level, totalDisks, mdMinor, devices) = raidSets[key]
505     - if len(devices) < totalDisks:
506     + if len(devices) == totalDisks - 1 and level in (1, 5, 6):
507     + log.info("missing components of raid device md%d. The "
508     + "raid device needs %d drive(s) and only %d (was/were) found. "
509     + "This raid device will be started in degraded mode.", mdMinor,
510     + totalDisks, len(devices))
511     + elif len(devices) == totalDisks - 2 and level == 6:
512     + log.info("missing components of raid device md%d. The "
513     + "raid device needs %d drive(s) and only %d (was/were) found. "
514     + "This raid device will be started in degraded mode.", mdMinor,
515     + totalDisks, len(devices))
516     + elif len(devices) < totalDisks:
517     log.warning("missing components of raid device md%d. The "
518     "raid device needs %d drive(s) and only %d (was/were) "
519     "found. This raid device will not be started.", mdMinor,
520     @@ -168,11 +178,11 @@
521     if isRaid0(raidlevel):
522     return 2
523     elif isRaid1(raidlevel):
524     - return 2
525     + return 1
526     elif isRaid5(raidlevel):
527     - return 3
528     + return 2
529     elif isRaid6(raidlevel):
530     - return 4
531     + return 2
532     else:
533     raise ValueError, "invalid raidlevel in get_raid_min_members"
534    
535     --- anaconda-11.1.2.87/text.py.smeserver 2007-03-23 15:24:34.000000000 -0600
536     +++ anaconda-11.1.2.87/text.py 2007-12-20 13:50:39.000000000 -0700
537     @@ -583,7 +583,8 @@
538     "from here. You will have to try "
539     "again."),
540     buttons=[_("OK")])
541     - anaconda.dispatch.gotoPrev()
542     + else:
543     + anaconda.dispatch.gotoPrev()
544     else:
545     anaconda.dispatch.gotoNext()
546    
547 slords 1.10 --- anaconda-11.1.2.87/upgrade.py.smeserver 2007-01-22 16:14:06.000000000 -0700
548 slords 1.9 +++ 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 slords 1.10 --- anaconda-11.1.2.87/yuminstall.py.smeserver 2007-09-11 11:51:21.000000000 -0600
559 slords 1.7 +++ anaconda-11.1.2.87/yuminstall.py 2008-03-17 08:01:27.000000000 -0600
560     @@ -1083,7 +1083,8 @@
561    
562     if foundModule == 1:
563     for (n, arch, tag) in kernelVersions:
564     - recreateInitrd(n, anaconda.rootPath)
565     + if os.access("/boot/System.map-%s" %(n,), os.X_OK):
566     + recreateInitrd(n, anaconda.rootPath)
567    
568     def selectBestKernel(self, anaconda):
569     """Find the best kernel package which is available and select it."""
570 slords 1.9 @@ -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 slords 1.7 @@ -1729,7 +1730,8 @@
603     # to the old method.
604     if len(self._installedDriverModules) == len(anaconda.id.extraModules):
605     for (n, arch, tag) in self.kernelVersionList():
606     - recreateInitrd(n, anaconda.rootPath)
607     + if os.access("/boot/System.map-%s" %(n,), os.X_OK):
608     + recreateInitrd(n, anaconda.rootPath)
609     else:
610     modulesList = filter(lambda m: m not in self._installedDriverModules, anaconda.id.extraModules)
611     self.copyExtraModules(anaconda, modulesList)
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed