| 1 |
diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/bootloader.py mezzanine_patched_anaconda-10.1.1.37/bootloader.py |
| 2 |
--- anaconda-10.1.1.37/bootloader.py 2005-04-22 22:06:17.000000000 +1000 |
| 3 |
+++ mezzanine_patched_anaconda-10.1.1.37/bootloader.py 2006-04-06 06:43:38.459411580 +1000 |
| 4 |
@@ -185,11 +185,6 @@ |
| 5 |
except BootyNoKernelWarning: |
| 6 |
if not justConfigFile: |
| 7 |
w.pop() |
| 8 |
- if intf: |
| 9 |
- intf.messageWindow(_("Warning"), |
| 10 |
- _("No kernel packages were installed on your " |
| 11 |
- "system. Your boot loader configuration " |
| 12 |
- "will not be changed.")) |
| 13 |
dosync() |
| 14 |
|
| 15 |
# note that this function no longer actually creates an initrd. |
| 16 |
diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/findpackageset.py mezzanine_patched_anaconda-10.1.1.37/findpackageset.py |
| 17 |
--- anaconda-10.1.1.37/findpackageset.py 2005-02-08 11:42:45.000000000 +1100 |
| 18 |
+++ mezzanine_patched_anaconda-10.1.1.37/findpackageset.py 2006-04-06 06:44:04.715849054 +1000 |
| 19 |
@@ -108,21 +108,15 @@ |
| 20 |
# loop through packages and find ones which are a newer |
| 21 |
# version than what we have |
| 22 |
for ( name, arch ) in instDict.keys(): |
| 23 |
- if ( name, arch ) in availDict.keys(): |
| 24 |
- # Exact arch upgrade |
| 25 |
- h = instDict[(name, arch)] |
| 26 |
- pkg = availDict[(name,arch)] |
| 27 |
- comparePackageForUpgrade(updDict, h, pkg) |
| 28 |
- else: |
| 29 |
- # See if we have a better arch than that installed |
| 30 |
- if name in availNames.keys(): |
| 31 |
- bestarch = findBestArch(availNames[name]) |
| 32 |
- if not bestarch: |
| 33 |
- continue |
| 34 |
- if availDict.has_key((name,bestarch)): |
| 35 |
- h = instDict[(name,arch)] |
| 36 |
- pkg = availDict[(name,bestarch)] |
| 37 |
- comparePackageForUpgrade(updDict, h, pkg) |
| 38 |
+ # See if we have a better arch than that installed |
| 39 |
+ if name in availNames.keys(): |
| 40 |
+ bestarch = findBestArch(availNames[name]) |
| 41 |
+ if not bestarch: |
| 42 |
+ continue |
| 43 |
+ if availDict.has_key((name,bestarch)): |
| 44 |
+ h = instDict[(name,arch)] |
| 45 |
+ pkg = availDict[(name,bestarch)] |
| 46 |
+ comparePackageForUpgrade(updDict, h, pkg) |
| 47 |
|
| 48 |
# handle obsoletes |
| 49 |
for pkg in hdlist: |
| 50 |
diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/instdata.py mezzanine_patched_anaconda-10.1.1.37/instdata.py |
| 51 |
--- anaconda-10.1.1.37/instdata.py 2004-08-25 23:12:10.000000000 +1000 |
| 52 |
+++ mezzanine_patched_anaconda-10.1.1.37/instdata.py 2006-04-06 06:44:44.401953223 +1000 |
| 53 |
@@ -116,10 +116,7 @@ |
| 54 |
|
| 55 |
def write(self, instPath): |
| 56 |
self.langSupport.write (instPath) |
| 57 |
- |
| 58 |
- if not self.isHeadless: |
| 59 |
- self.keyboard.write (instPath) |
| 60 |
- |
| 61 |
+ self.keyboard.write (instPath) |
| 62 |
self.timezone.write (instPath) |
| 63 |
self.auth.write (instPath) |
| 64 |
self.firewall.write (instPath) |
| 65 |
@@ -172,8 +169,8 @@ |
| 66 |
|
| 67 |
self.instLanguage.writeKS(f) |
| 68 |
self.langSupport.writeKS(f) |
| 69 |
+ self.keyboard.writeKS(f) |
| 70 |
if not self.isHeadless: |
| 71 |
- self.keyboard.writeKS(f) |
| 72 |
self.xsetup.writeKS(f, self.desktop) |
| 73 |
self.network.writeKS(f) |
| 74 |
self.zfcp.writeKS(f) |
| 75 |
diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/kickstart.py mezzanine_patched_anaconda-10.1.1.37/kickstart.py |
| 76 |
--- anaconda-10.1.1.37/kickstart.py 2006-04-06 06:59:28.404442287 +1000 |
| 77 |
+++ mezzanine_patched_anaconda-10.1.1.37/kickstart.py 2006-04-06 06:45:23.609141002 +1000 |
| 78 |
@@ -99,6 +99,17 @@ |
| 79 |
name = "kickstart" |
| 80 |
|
| 81 |
def postAction(self, rootPath, serial, intf): |
| 82 |
+ win = intf.waitWindow(_("Post Install Script"), |
| 83 |
+ _("The post installation script is running...")) |
| 84 |
+ |
| 85 |
+ script = ( "/sbin/syslogd &\n" |
| 86 |
+ "sleep 2\n" |
| 87 |
+ "/sbin/e-smith/signal-event post-install\n" ) |
| 88 |
+ s = Script(script, interp="/bin/sh", inChroot=1) |
| 89 |
+ log("%s", s) |
| 90 |
+ s.run(rootPath, serial) |
| 91 |
+ win.pop() |
| 92 |
+ |
| 93 |
log("Running kickstart %%post script(s)") |
| 94 |
for script in self.postScripts: |
| 95 |
script.run(rootPath, serial) |
| 96 |
--- anaconda-10.1.1.81/lang-table.sme 2004-10-25 06:38:22.000000000 -0600 |
| 97 |
+++ anaconda-10.1.1.81/lang-table 2008-03-07 13:34:48.000000000 -0700 |
| 98 |
@@ -1,41 +1,20 @@ |
| 99 |
-Arabic ar none ar_SA.UTF-8 us Asia/Riyadh ar_SA.UTF-8 |
| 100 |
-Bengali bn none bn_BD.UTF-8 us Asia/Dhaka bn_BD.UTF-8 |
| 101 |
-Bengali(India) bn none bn_IN.UTF-8 us Asia/Calcutta bn_IN.UTF-8 |
| 102 |
Bulgarian bg latarcyrheb-sun16 bg_BG.UTF-8 bg Europe/Sofia bg_BG.UTF-8 |
| 103 |
-Catalan ca latarcyrheb-sun16 ca_ES.UTF-8 es Europe/Madrid es_ES.UTF-8 |
| 104 |
Chinese(Simplified) zh_CN bterm zh_CN.UTF-8 us Asia/Shanghai zh_CN.UTF-8 |
| 105 |
-Chinese(Traditional) zh_TW bterm zh_TW.UTF-8 us Asia/Taipei zh_TW.UTF-8 |
| 106 |
-Croatian hr latarcyrheb-sun16 hr_HR.UTF-8 croat Europe/Zagreb hr_HR.UTF-8 |
| 107 |
-Czech cs latarcyrheb-sun16 cs_CZ.UTF-8 cz-lat2 Europe/Prague cs_CZ.UTF-8 |
| 108 |
Danish da latarcyrheb-sun16 da_DK.UTF-8 dk Europe/Copenhagen da_DK.UTF-8 |
| 109 |
Dutch nl latarcyrheb-sun16 nl_NL.UTF-8 nl Europe/Amsterdam nl_NL.UTF-8 |
| 110 |
English en latarcyrheb-sun16 en_US.UTF-8 us America/New_York en_US.UTF-8 |
| 111 |
Estonian et latarcyrheb-sun16 et_EE.UTF-8 et Europe/Tallinn et_EE.UTF-8 |
| 112 |
-Finnish fi latarcyrheb-sun16 fi_FI.UTF-8 fi Europe/Helsinki fi_FI.UTF-8 |
| 113 |
French fr latarcyrheb-sun16 fr_FR.UTF-8 fr-latin1 Europe/Paris fr_FR.UTF-8 |
| 114 |
German de latarcyrheb-sun16 de_DE.UTF-8 de-latin1-nodeadkeys Europe/Berlin de_DE.UTF-8 |
| 115 |
-Gujarati gu none gu_IN.UTF-8 us Asia/Calcutta gu_IN.UTF-8 |
| 116 |
-Hindi hi none hi_IN.UTF-8 us Asia/Calcutta hi_IN.UTF-8 |
| 117 |
Hungarian hu latarcyrheb-sun16 hu_HU.UTF-8 hu Europe/Budapest hu_HU.UTF-8 |
| 118 |
-Icelandic is latarcyrheb-sun16 is_IS.UTF-8 is-latin1 Atlantic/Reykjavik is_IS.UTF-8 |
| 119 |
Italian it latarcyrheb-sun16 it_IT.UTF-8 it Europe/Rome it_IT.UTF-8 |
| 120 |
Japanese ja bterm ja_JP.UTF-8 jp106 Asia/Tokyo ja_JP.UTF-8 |
| 121 |
-Korean ko bterm ko_KR.UTF-8 us Asia/Seoul ko_KR.UTF-8 |
| 122 |
-Macedonian mk latarcyrheb-sun16 mk_MK.UTF-8 mk Europe/Skopje mk_MK.UTF-8 |
| 123 |
-Malay ms latarcyrheb-sun16 ms_MY.UTF-8 us Asia/Kuala_Lumpur ms_MY.UTF-8 |
| 124 |
Norwegian nb latarcyrheb-sun16 nb_NO.UTF-8 no Europe/Oslo nb_NO.UTF-8 |
| 125 |
-Persian fa none fa_IR.UTF-8 us Asia/Tehran fa_IR.UTF-8 |
| 126 |
Polish pl latarcyrheb-sun16 pl_PL.UTF-8 pl Europe/Warsaw pl_PL.UTF-8 |
| 127 |
Portuguese pt latarcyrheb-sun16 pt_PT.UTF-8 pt-latin1 Europe/Lisbon pt_PT.UTF-8 |
| 128 |
Portuguese(Brazilian) pt_BR latarcyrheb-sun16 pt_BR.UTF-8 br-abnt2 America/Sao_Paulo pt_BR.UTF-8 |
| 129 |
-Punjabi pa none pa_IN.UTF-8 us Asia/Calcutta pa_IN.UTF-8 |
| 130 |
Russian ru latarcyrheb-sun16 ru_RU.UTF-8 ru Europe/Moscow ru_RU.UTF-8 |
| 131 |
Slovenian sl latarcyrheb-sun16 sl_SI.UTF-8 slovene Europe/Ljubljana sl_SI.UTF-8 |
| 132 |
Spanish es latarcyrheb-sun16 es_ES.UTF-8 es Europe/Madrid es_ES.UTF-8 |
| 133 |
Swedish sv latarcyrheb-sun16 sv_SE.UTF-8 sv-latin1 Europe/Stockholm sv_SE.UTF-8 |
| 134 |
-Tamil ta none ta_IN.UTF-8 us Asia/Calcutta ta_IN.UTF-8 |
| 135 |
Turkish tr latarcyrheb-sun16 tr_TR.UTF-8 trq Europe/Istanbul tr_TR.UTF-8 |
| 136 |
-Ukrainian uk latarcyrheb-sun16 uk_UA.UTF-8 ua-utf Europe/Kiev uk_UA.UTF-8 |
| 137 |
-Vietnamese vi latarcyrheb-sun16 vi_VN.UTF-8 us Asia/Saigon vi_VN.UTF-8 |
| 138 |
-Welsh cy latarcyrheb-sun16 cy_GB.UTF-8 uk Europe/London cy_GB.UTF-8 |
| 139 |
-Zulu zu latarcyrheb-sun16 zu_ZA.UTF-8 us Africa/Johannesburg zu_ZA.UTF-8 |
| 140 |
--- anaconda-10.1.1.81/packages.py.sme 2008-03-17 11:02:31.000000000 -0600 |
| 141 |
+++ anaconda-10.1.1.81/packages.py 2008-03-17 11:07:55.000000000 -0600 |
| 142 |
@@ -1588,7 +1588,7 @@ |
| 143 |
"from testers, and it is not suitable " |
| 144 |
"for day to day usage.\n\n" |
| 145 |
"To report feedback, please visit:\n\n" |
| 146 |
- " http://www.centos.orrg/bugs\n\n" |
| 147 |
+ " http://bugs.contribs.org/\n\n" |
| 148 |
"and file a report against '%s'.\n" |
| 149 |
%(productName, fileagainst)), |
| 150 |
type="custom", custom_icon="warning", |
| 151 |
diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/partedUtils.py mezzanine_patched_anaconda-10.1.1.37/partedUtils.py |
| 152 |
--- anaconda-10.1.1.37/partedUtils.py 2006-04-06 06:59:28.175482025 +1000 |
| 153 |
+++ mezzanine_patched_anaconda-10.1.1.37/partedUtils.py 2006-04-06 06:47:31.309955789 +1000 |
| 154 |
@@ -473,8 +473,8 @@ |
| 155 |
return None |
| 156 |
|
| 157 |
def getCentOSReleaseString(mountpoint): |
| 158 |
- if os.access(mountpoint + "/etc/redhat-release", os.R_OK): |
| 159 |
- f = open(mountpoint + "/etc/redhat-release", "r") |
| 160 |
+ if os.access(mountpoint + "/etc/e-smith-release", os.R_OK): |
| 161 |
+ f = open(mountpoint + "/etc/e-smith-release", "r") |
| 162 |
try: |
| 163 |
lines = f.readlines() |
| 164 |
except IOError: |
| 165 |
@@ -516,6 +516,7 @@ |
| 166 |
return 1 |
| 167 |
|
| 168 |
productUpgrades = { |
| 169 |
+ "SME Server": ("Mitel Networks", "SME Server", "e-smith server", ), |
| 170 |
"Red Hat Enterprise Linux AS": ("Red Hat Linux Advanced Server", ), |
| 171 |
"Red Hat Enterprise Linux WS": ("Red Hat Linux Advanced Workstation",), |
| 172 |
# FIXME: this probably shouldn't be in a release... |
| 173 |
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 |
| 174 |
--- anaconda-10.1.1.37/textw/installpath_text.py 2003-04-22 07:21:24.000000000 +1000 |
| 175 |
+++ mezzanine_patched_anaconda-10.1.1.37/textw/installpath_text.py 2006-04-06 06:56:41.641388290 +1000 |
| 176 |
@@ -45,12 +45,12 @@ |
| 177 |
if orig != None: |
| 178 |
default = orig |
| 179 |
|
| 180 |
- (button, choice) = ListboxChoiceWindow(screen, _("Installation Type"), |
| 181 |
- _("What type of system would you like to install?"), |
| 182 |
- choices, [TEXT_OK_BUTTON, TEXT_BACK_BUTTON], |
| 183 |
- width = 40, default = default, help = "installpath") |
| 184 |
+ choice = default |
| 185 |
+ rc = intf.messageWindow(_("Warning"), |
| 186 |
+ _("All disks will be reformatted and any data will be lost. Proceed?"), |
| 187 |
+ type = "yesno", default = "no") |
| 188 |
|
| 189 |
- if button == TEXT_BACK_CHECK: |
| 190 |
+ if rc == 0: |
| 191 |
return INSTALL_BACK |
| 192 |
|
| 193 |
if (choice != orig): |
| 194 |
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 |
| 195 |
--- anaconda-10.1.1.37/textw/language_text.py 2004-09-14 01:12:37.000000000 +1000 |
| 196 |
+++ mezzanine_patched_anaconda-10.1.1.37/textw/language_text.py 2006-04-06 06:53:37.317389387 +1000 |
| 197 |
@@ -91,85 +91,12 @@ |
| 198 |
|
| 199 |
class LanguageSupportWindow: |
| 200 |
def __call__(self, screen, language): |
| 201 |
- |
| 202 |
- # should already be sorted |
| 203 |
- ct = CheckboxTree(height = 8, scroll = 1) |
| 204 |
- |
| 205 |
- for lang in language.getAllSupported(): |
| 206 |
- ct.append(lang, lang, 0) |
| 207 |
- |
| 208 |
- for lang in language.getSupported (): |
| 209 |
- ct.setEntryValue(lang, 1) |
| 210 |
- |
| 211 |
- current = language.getDefault() |
| 212 |
- ct.setCurrent(current) |
| 213 |
- ct.setEntryValue(current, 1) |
| 214 |
- |
| 215 |
- bb = ButtonBar (screen, (TEXT_OK_BUTTON, (_("Select All"), "all"), (_("Reset"), "reset"), TEXT_BACK_BUTTON)) |
| 216 |
- |
| 217 |
- message = (_("Choose additional languages that you would like to use " |
| 218 |
- "on this system:")) |
| 219 |
- tb = TextboxReflowed(50, message) |
| 220 |
- |
| 221 |
- g = GridFormHelp (screen, _("Language Support"), "langsupport", 1, 4) |
| 222 |
- |
| 223 |
- g.add (tb, 0, 0, (0, 0, 0, 1), anchorLeft = 1) |
| 224 |
- g.add (ct, 0, 1, (0, 0, 0, 1)) |
| 225 |
- g.add (bb, 0, 3, growx = 1) |
| 226 |
- |
| 227 |
- while 1: |
| 228 |
- result = g.run() |
| 229 |
- |
| 230 |
- rc = bb.buttonPressed (result) |
| 231 |
- |
| 232 |
- if rc == TEXT_BACK_CHECK: |
| 233 |
- screen.popWindow() |
| 234 |
- return INSTALL_BACK |
| 235 |
- |
| 236 |
- if rc == "all": |
| 237 |
- for lang in language.getAllSupported(): |
| 238 |
- ct.setEntryValue(lang, 1) |
| 239 |
- |
| 240 |
- if rc == "reset": |
| 241 |
- for lang in language.getAllSupported(): |
| 242 |
- if lang == current: |
| 243 |
- ct.setEntryValue(lang, 1) |
| 244 |
- else: |
| 245 |
- ct.setEntryValue(lang, 0) |
| 246 |
- |
| 247 |
- if rc == TEXT_OK_CHECK or result == TEXT_F12_CHECK: |
| 248 |
- # --If they selected all langs, then set language.setSupported to |
| 249 |
- # None. This installs all langs |
| 250 |
- |
| 251 |
- if ct.getSelection() == []: |
| 252 |
- ButtonChoiceWindow(screen, _("Invalid Choice"), |
| 253 |
- _("You must select at least one language to install."), |
| 254 |
- buttons = [ TEXT_OK_BUTTON ], width = 40) |
| 255 |
- |
| 256 |
- else: |
| 257 |
- # set selected langs once |
| 258 |
- language.setSupported (ct.getSelection()) |
| 259 |
- |
| 260 |
- # we may need to reset the default language |
| 261 |
- default = language.getDefault() |
| 262 |
- if default not in ct.getSelection(): |
| 263 |
- sellangs = language.getSupported() |
| 264 |
- |
| 265 |
- if len(sellangs) > 0: |
| 266 |
- language.setDefault(sellangs[0]) |
| 267 |
- else: |
| 268 |
- language.setDefault(None) |
| 269 |
- |
| 270 |
- else: |
| 271 |
- language.setDefault(default) |
| 272 |
- |
| 273 |
- # now set new selected langs again in case old default |
| 274 |
- # lang was left in the list before we switched the default |
| 275 |
- language.setSupported (ct.getSelection()) |
| 276 |
- |
| 277 |
- screen.popWindow() |
| 278 |
- return INSTALL_OK |
| 279 |
- |
| 280 |
+ langs = [] |
| 281 |
+ default = language.getDefault() |
| 282 |
+ langs.append(default) |
| 283 |
+ language.setSupported(langs) |
| 284 |
+ language.setDefault(default) |
| 285 |
+ return INSTALL_OK |
| 286 |
|
| 287 |
class LanguageDefaultWindow: |
| 288 |
def __call__(self,screen, language): |
| 289 |
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 |
| 290 |
--- anaconda-10.1.1.37/textw/progress_text.py 2003-10-08 08:05:01.000000000 +1000 |
| 291 |
+++ mezzanine_patched_anaconda-10.1.1.37/textw/progress_text.py 2006-04-06 06:54:35.803234655 +1000 |
| 292 |
@@ -103,8 +103,8 @@ |
| 293 |
|
| 294 |
currow = 0 |
| 295 |
|
| 296 |
- width = 47 + max (len (name), len (size), len (sum)) |
| 297 |
- self.name = Label(" " * 48) |
| 298 |
+ width = 60 + max (len (name), len (size), len (sum)) |
| 299 |
+ self.name = Label(" " * 59) |
| 300 |
self.size = Label(" ") |
| 301 |
detail = Grid(2, 2) |
| 302 |
detail.setField(Label(name), 0, 0, anchorLeft = 1) |
| 303 |
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 |
| 304 |
--- anaconda-10.1.1.37/textw/timezone_text.py 2004-05-12 08:29:07.000000000 +1000 |
| 305 |
+++ mezzanine_patched_anaconda-10.1.1.37/textw/timezone_text.py 2006-04-06 06:56:03.241054486 +1000 |
| 306 |
@@ -48,8 +48,7 @@ |
| 307 |
args = [ "/usr/sbin/hwclock" ] |
| 308 |
|
| 309 |
args.append("--hctosys") |
| 310 |
- if self.c.selected(): |
| 311 |
- args.append("--utc") |
| 312 |
+ args.append("--utc") |
| 313 |
|
| 314 |
iutil.execWithRedirect(args[0], args) |
| 315 |
self.g.setTimer(500) |
| 316 |
@@ -91,14 +90,12 @@ |
| 317 |
self.l.setCurrent(default) |
| 318 |
# self.l.setCallback(self.updateClock) |
| 319 |
|
| 320 |
- self.c = Checkbox("System clock uses UTC", isOn = asUtc) |
| 321 |
# self.c.setCallback(self.updateSysClock) |
| 322 |
|
| 323 |
self.g = GridFormHelp(screen, _("Time Zone Selection"), "timezone", |
| 324 |
1, 5) |
| 325 |
self.g.add(t, 0, 0) |
| 326 |
# self.g.add(self.label, 0, 1, padding = (0, 1, 0, 0), anchorLeft = 1) |
| 327 |
- self.g.add(self.c, 0, 2, padding = (0, 1, 0, 1), anchorLeft = 1) |
| 328 |
self.g.add(self.l, 0, 3, padding = (0, 0, 0, 1)) |
| 329 |
self.g.add(bb, 0, 4, growx = 1) |
| 330 |
|
| 331 |
@@ -126,7 +123,7 @@ |
| 332 |
break |
| 333 |
|
| 334 |
screen.popWindow() |
| 335 |
- timezone.setTimezoneInfo(self.l.current(), asUtc = self.c.selected()) |
| 336 |
+ timezone.setTimezoneInfo(self.l.current(), asUtc = 1) |
| 337 |
|
| 338 |
return INSTALL_OK |
| 339 |
|
| 340 |
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 |
| 341 |
--- anaconda-10.1.1.37/textw/upgrade_text.py 2004-08-19 02:34:08.000000000 +1000 |
| 342 |
+++ mezzanine_patched_anaconda-10.1.1.37/textw/upgrade_text.py 2006-04-06 06:59:04.069665851 +1000 |
| 343 |
@@ -20,8 +20,8 @@ |
| 344 |
from fsset import * |
| 345 |
from flags import flags |
| 346 |
from constants import * |
| 347 |
-import upgradeclass |
| 348 |
-UpgradeClass = upgradeclass.InstallClass |
| 349 |
+import smeupgradeclass |
| 350 |
+UpgradeClass = smeupgradeclass.InstallClass |
| 351 |
|
| 352 |
from rhpl.log import log |
| 353 |
from rhpl.translate import _ |
| 354 |
@@ -196,26 +196,19 @@ |
| 355 |
else: |
| 356 |
scroll = 0 |
| 357 |
partList = [] |
| 358 |
- partList.append(_("Reinstall System")) |
| 359 |
+ partList.append(_("Erase ALL disks, and perform a fresh install")) |
| 360 |
|
| 361 |
for (drive, fs, desc) in parts: |
| 362 |
- if drive[:5] != "/dev/": |
| 363 |
- devname = "/dev/" + drive |
| 364 |
- else: |
| 365 |
- devname = drive |
| 366 |
- partList.append("%s (%s)" %(desc, drive)) |
| 367 |
+ partList.append(_("Upgrade existing \"%s\" system") %(desc)) |
| 368 |
|
| 369 |
(button, choice) = ListboxChoiceWindow(screen, _("System to Upgrade"), |
| 370 |
- _("One or more existing Linux installations " |
| 371 |
- "have been found " |
| 372 |
- "on your system.\n\nPlease choose one to upgrade, " |
| 373 |
- "or select 'Reinstall System' to freshly install " |
| 374 |
- "your system."), partList, |
| 375 |
+ _("Your system is upgradeable."), partList, |
| 376 |
[ TEXT_OK_BUTTON, |
| 377 |
TEXT_BACK_BUTTON ], |
| 378 |
width = 55, scroll = scroll, |
| 379 |
height = height, |
| 380 |
- help = "upgraderoot") |
| 381 |
+ help = "upgraderoot", |
| 382 |
+ default = 1) |
| 383 |
|
| 384 |
if button == TEXT_BACK_CHECK: |
| 385 |
return INSTALL_BACK |
| 386 |
diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/upgrade.py mezzanine_patched_anaconda-10.1.1.37/upgrade.py |
| 387 |
--- anaconda-10.1.1.37/upgrade.py 2006-04-06 06:59:28.387445237 +1000 |
| 388 |
+++ mezzanine_patched_anaconda-10.1.1.37/upgrade.py 2006-04-06 06:50:27.473356801 +1000 |
| 389 |
@@ -49,6 +49,21 @@ |
| 390 |
upgrade_remove_blacklist = ( ("samba","ppc64"),) |
| 391 |
|
| 392 |
def findRootParts(intf, id, dispatch, dir, chroot): |
| 393 |
+# w = intf.waitWindow(_("Converting to RAID"), |
| 394 |
+# _("Converting to RAID, this may take several minutes...")) |
| 395 |
+# |
| 396 |
+# # XXX - FIXME - HACK RAID upgrade |
| 397 |
+# |
| 398 |
+# rc = iutil.execWithRedirect("/tmp/updates/raidconvert", |
| 399 |
+# ["raidconvert"], |
| 400 |
+# stdin = None, |
| 401 |
+# stdout = "/dev/tty5", |
| 402 |
+# stderr = "/dev/tty5") |
| 403 |
+# w.pop() |
| 404 |
+# |
| 405 |
+# if rc: |
| 406 |
+# raise SystemError |
| 407 |
+ |
| 408 |
if dir == DISPATCH_BACK: |
| 409 |
return |
| 410 |
if id.rootParts is None: |
| 411 |
@@ -60,7 +75,7 @@ |
| 412 |
|
| 413 |
if id.rootParts is not None and len(id.rootParts) > 0: |
| 414 |
dispatch.skipStep("findinstall", skip = 0) |
| 415 |
- if productName.find("Red Hat Enterprise Linux") == -1: |
| 416 |
+ if productName.find("SME Server") == -1: |
| 417 |
dispatch.skipStep("installtype", skip = 1) |
| 418 |
else: |
| 419 |
dispatch.skipStep("findinstall", skip = 1) |
| 420 |
@@ -513,10 +528,10 @@ |
| 421 |
pass |
| 422 |
sys.exit(0) |
| 423 |
|
| 424 |
- if not os.access(instPath + "/etc/redhat-release", os.R_OK): |
| 425 |
+ if not os.access(instPath + "/etc/e-smith-release", os.R_OK): |
| 426 |
rc = intf.messageWindow(_("Warning"), |
| 427 |
_("This system does not have an " |
| 428 |
- "/etc/redhat-release file. It is possible " |
| 429 |
+ "/etc/e-smith-release file. It is possible " |
| 430 |
"that this is not a %s system. " |
| 431 |
"Continuing with the upgrade process may " |
| 432 |
"leave the system in an unusable state. Do " |
| 433 |
@@ -533,7 +548,7 @@ |
| 434 |
# Figure out current version for upgrade nag and for determining weird |
| 435 |
# upgrade cases |
| 436 |
supportedUpgradeVersion = -1 |
| 437 |
- mi = ts.dbMatch('provides', 'redhat-release') |
| 438 |
+ mi = ts.dbMatch('provides', 'e-smith-release') |
| 439 |
for h in mi: |
| 440 |
if h[rpm.RPMTAG_EPOCH] is None: |
| 441 |
epoch = None |
| 442 |
@@ -541,7 +556,7 @@ |
| 443 |
epoch = str(h[rpm.RPMTAG_EPOCH]) |
| 444 |
|
| 445 |
if supportedUpgradeVersion <= 0: |
| 446 |
- val = rpm.labelCompare((None, '3', '1'), |
| 447 |
+ val = rpm.labelCompare(('21', '6.0', '11'), |
| 448 |
(epoch, h[rpm.RPMTAG_VERSION], |
| 449 |
h[rpm.RPMTAG_RELEASE])) |
| 450 |
if val > 0: |
| 451 |
@@ -550,9 +565,6 @@ |
| 452 |
supportedUpgradeVersion = 1 |
| 453 |
break |
| 454 |
|
| 455 |
- if productName.find("Red Hat Enterprise Linux") == -1: |
| 456 |
- supportedUpgradeVersion = 1 |
| 457 |
- |
| 458 |
if supportedUpgradeVersion == 0: |
| 459 |
rc = intf.messageWindow(_("Warning"), |
| 460 |
_("You appear to be upgrading from a system " |
Parent Directory
| 
Revision Log
| 
Revision Graph
