| 1 |
diff -ruN anaconda-13.21.215.p15/textw/upgrade_bootloader_text.py anaconda-13.21.215/textw/upgrade_bootloader_text.py |
| 2 |
--- anaconda-13.21.215.p15/textw/upgrade_bootloader_text.py 2013-08-02 06:47:00.000000000 -0700 |
| 3 |
+++ anaconda-13.21.215/textw/upgrade_bootloader_text.py 2014-03-17 23:48:57.000000000 -0700 |
| 4 |
@@ -98,72 +98,19 @@ |
| 5 |
update = 1 |
| 6 |
|
| 7 |
if newToLibata or self.type is None or self.bootDev is None: |
| 8 |
- if newToLibata: |
| 9 |
- t = TextboxReflowed(53, |
| 10 |
- _("Due to system changes, your boot loader " |
| 11 |
- "configuration can not be automatically updated.")) |
| 12 |
- else: |
| 13 |
- t = TextboxReflowed(53, |
| 14 |
- _("The installer is unable to detect the boot loader " |
| 15 |
- "currently in use on your system.")) |
| 16 |
- |
| 17 |
- |
| 18 |
- self.update_radio = blradio.add(_("Update boot loader configuration"), |
| 19 |
- "update", update) |
| 20 |
- self.update_radio.w.checkboxSetFlags(FLAG_DISABLED, FLAGS_SET) |
| 21 |
nobl = 1 |
| 22 |
- else: |
| 23 |
- t = TextboxReflowed(53, |
| 24 |
- _("The installer has detected the %(type)s " |
| 25 |
- "boot loader currently installed on " |
| 26 |
- "%(bootDev)s.") |
| 27 |
- % {'type': self.type, 'bootDev': self.bootDev}) |
| 28 |
- |
| 29 |
- self.update_radio = blradio.add(_("Update boot loader configuration"), |
| 30 |
- "update", update) |
| 31 |
- |
| 32 |
- self.nobl_radio = blradio.add(_("Skip boot loader updating"), |
| 33 |
- "nobl", nobl) |
| 34 |
- |
| 35 |
- buttons = ButtonBar(screen, [TEXT_OK_BUTTON, TEXT_BACK_BUTTON]) |
| 36 |
- |
| 37 |
- grid = GridFormHelp(screen, _("Upgrade Boot Loader Configuration"), |
| 38 |
- "bl-upgrade", 1, 5) |
| 39 |
- |
| 40 |
- grid.add(t, 0, 0, (0,0,0,1)) |
| 41 |
- grid.add(self.update_radio, 0, 1, (0,0,0,0)) |
| 42 |
- grid.add(self.nobl_radio, 0, 2, (0,0,0,0)) |
| 43 |
- grid.add(buttons, 0, 3, growx = 1) |
| 44 |
- |
| 45 |
|
| 46 |
- while 1: |
| 47 |
- result = grid.run() |
| 48 |
- |
| 49 |
- button = buttons.buttonPressed(result) |
| 50 |
- |
| 51 |
- if button == TEXT_BACK_CHECK: |
| 52 |
- screen.popWindow() |
| 53 |
- return INSTALL_BACK |
| 54 |
- |
| 55 |
- if blradio.getSelection() == "nobl": |
| 56 |
- self.dispatch.skipStep("bootloadersetup", skip = 1) |
| 57 |
- self.dispatch.skipStep("bootloader", skip = 1) |
| 58 |
- self.dispatch.skipStep("bootloaderadvanced", skip = 1) |
| 59 |
- self.dispatch.skipStep("instbootloader", skip = 1) |
| 60 |
- else: |
| 61 |
- self.dispatch.skipStep("bootloadersetup", skip = 0) |
| 62 |
- self.dispatch.skipStep("bootloader", skip = 1) |
| 63 |
- self.dispatch.skipStep("bootloaderadvanced", skip = 1) |
| 64 |
- self.dispatch.skipStep("instbootloader", skip = 0) |
| 65 |
- self.bl.doUpgradeOnly = 1 |
| 66 |
- |
| 67 |
- if self.type == "GRUB": |
| 68 |
- self.bl.useGrubVal = 1 |
| 69 |
- else: |
| 70 |
- self.bl.useGrubVal = 0 |
| 71 |
- self.bl.setDevice(devicePathToName(self.bootDev)) |
| 72 |
- |
| 73 |
- |
| 74 |
- |
| 75 |
- screen.popWindow() |
| 76 |
- return INSTALL_OK |
| 77 |
+ if nobl == 1: |
| 78 |
+ self.dispatch.skipStep("bootloadersetup", skip = 1) |
| 79 |
+ self.dispatch.skipStep("bootloader", skip = 1) |
| 80 |
+ self.dispatch.skipStep("bootloaderadvanced", skip = 1) |
| 81 |
+ self.dispatch.skipStep("instbootloader", skip = 1) |
| 82 |
+ else: |
| 83 |
+ self.dispatch.skipStep("bootloadersetup", skip = 0) |
| 84 |
+ self.dispatch.skipStep("bootloader", skip = 1) |
| 85 |
+ self.dispatch.skipStep("bootloaderadvanced", skip = 1) |
| 86 |
+ self.dispatch.skipStep("instbootloader", skip = 0) |
| 87 |
+ self.bl.doUpgradeOnly = 1 |
| 88 |
+ self.bl.useGrubVal = 1 |
| 89 |
+ self.bl.setDevice(devicePathToName(self.bootDev)) |
| 90 |
+ return INSTALL_OK |
Parent Directory
| 
Revision Log
| 
Revision Graph
