diff -ruN anaconda-13.21.215.p15/textw/upgrade_bootloader_text.py anaconda-13.21.215/textw/upgrade_bootloader_text.py --- anaconda-13.21.215.p15/textw/upgrade_bootloader_text.py 2013-08-02 06:47:00.000000000 -0700 +++ anaconda-13.21.215/textw/upgrade_bootloader_text.py 2014-03-17 23:48:57.000000000 -0700 @@ -98,72 +98,19 @@ update = 1 if newToLibata or self.type is None or self.bootDev is None: - if newToLibata: - t = TextboxReflowed(53, - _("Due to system changes, your boot loader " - "configuration can not be automatically updated.")) - 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) nobl = 1 - else: - t = TextboxReflowed(53, - _("The installer has detected the %(type)s " - "boot loader currently installed on " - "%(bootDev)s.") - % {'type': self.type, 'bootDev': self.bootDev}) - - self.update_radio = blradio.add(_("Update boot loader configuration"), - "update", update) - - self.nobl_radio = blradio.add(_("Skip boot loader updating"), - "nobl", nobl) - - 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(buttons, 0, 3, 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) - 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(devicePathToName(self.bootDev)) - - - - screen.popWindow() - return INSTALL_OK + if nobl == 1: + self.dispatch.skipStep("bootloadersetup", skip = 1) + self.dispatch.skipStep("bootloader", skip = 1) + self.dispatch.skipStep("bootloaderadvanced", skip = 1) + self.dispatch.skipStep("instbootloader", skip = 1) + 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 + self.bl.useGrubVal = 1 + self.bl.setDevice(devicePathToName(self.bootDev)) + return INSTALL_OK