diff options
| author | Jeremy Katz <katzj@redhat.com> | 2002-02-01 16:55:24 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2002-02-01 16:55:24 +0000 |
| commit | 41e98278266e37b3c4e0e8aab91af75eaf8166b4 (patch) | |
| tree | d11bef40def3b1f355ecad82559fa64595fe824f | |
| parent | 26de55fc30ece101bbe70f7d4dc2d4a024ddf10d (diff) | |
| download | anaconda-41e98278266e37b3c4e0e8aab91af75eaf8166b4.tar.gz anaconda-41e98278266e37b3c4e0e8aab91af75eaf8166b4.tar.xz anaconda-41e98278266e37b3c4e0e8aab91af75eaf8166b4.zip | |
skip the later bootloader screens if we select no bootloader (thanks notting)
| -rw-r--r-- | iw/bootloader_gui.py | 2 | ||||
| -rw-r--r-- | textw/bootloader_text.py | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/iw/bootloader_gui.py b/iw/bootloader_gui.py index f7508561b..48fdb8a1b 100644 --- a/iw/bootloader_gui.py +++ b/iw/bootloader_gui.py @@ -68,10 +68,12 @@ class BootloaderWindow (InstallWindow): # set the bootloader type if self.none_radio.get_active(): self.dispatch.skipStep("instbootloader") + self.dispatch.skipStep("bootloaderadvanced") return else: self.bl.setUseGrub(self.grub_radio.get_active()) self.dispatch.skipStep("instbootloader", skip = 0) + self.dispatch.skipStep("bootloaderadvanced", skip = 0) if self.useFbcb.get_active(): (res, depth) = self.fbMode diff --git a/textw/bootloader_text.py b/textw/bootloader_text.py index c7190b924..7be4d47a0 100644 --- a/textw/bootloader_text.py +++ b/textw/bootloader_text.py @@ -80,12 +80,15 @@ class BootloaderChoiceWindow: if rc == "no": continue dispatch.skipStep("instbootloader", skip = (rc == "yes")) + dispatch.skipStep("bootloaderadvanced", skip = (rc == "yes")) elif blradio.getSelection() == "lilo": bl.setUseGrub(0) - dispatch.skipStep("instbootloader", 0) + dispatch.skipStep("instbootloader", 0) + dispatch.skipStep("bootloaderadvanced", 0) else: bl.setUseGrub(1) dispatch.skipStep("instbootloader", 0) + dispatch.skipStep("bootloaderadvanced", 0) screen.popWindow() return INSTALL_OK @@ -369,6 +372,7 @@ class BootloaderPasswordWindow: self.entry2.setFlags(FLAG_DISABLED, flag) def __call__(self, screen, dispatch, bl, fsset, diskSet): + if dispatch.stepInSkipList("instbootloader"): return INSTALL_NOOP if not bl.useGrub(): return INSTALL_NOOP |