summaryrefslogtreecommitdiffstats
path: root/textw
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2002-02-01 16:55:24 +0000
committerJeremy Katz <katzj@redhat.com>2002-02-01 16:55:24 +0000
commit41e98278266e37b3c4e0e8aab91af75eaf8166b4 (patch)
treed11bef40def3b1f355ecad82559fa64595fe824f /textw
parent26de55fc30ece101bbe70f7d4dc2d4a024ddf10d (diff)
downloadanaconda-41e98278266e37b3c4e0e8aab91af75eaf8166b4.tar.gz
anaconda-41e98278266e37b3c4e0e8aab91af75eaf8166b4.tar.xz
anaconda-41e98278266e37b3c4e0e8aab91af75eaf8166b4.zip
skip the later bootloader screens if we select no bootloader (thanks notting)
Diffstat (limited to 'textw')
-rw-r--r--textw/bootloader_text.py6
1 files changed, 5 insertions, 1 deletions
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