summaryrefslogtreecommitdiffstats
path: root/bootloader.py
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-09-20 03:31:26 +0000
committerJeremy Katz <katzj@redhat.com>2003-09-20 03:31:26 +0000
commit31f1add4879da48efb7af21fc5c575692cc3709d (patch)
tree7a541b8f54f91ed8309da17752e205b40db2cf30 /bootloader.py
parent8307d33391423f13c1deed409b80d8e381582a93 (diff)
downloadanaconda-31f1add4879da48efb7af21fc5c575692cc3709d.tar.gz
anaconda-31f1add4879da48efb7af21fc5c575692cc3709d.tar.xz
anaconda-31f1add4879da48efb7af21fc5c575692cc3709d.zip
merge from taroon
fairly large merge, but all fairly obvious stuff. will test in a tree tomorrow
Diffstat (limited to 'bootloader.py')
-rw-r--r--bootloader.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bootloader.py b/bootloader.py
index 66c56641d..323b0d875 100644
--- a/bootloader.py
+++ b/bootloader.py
@@ -38,7 +38,7 @@ def bootloaderSetupChoices(dispatch, bl, fsset, diskSet, dir):
return
choices = fsset.bootloaderChoices(diskSet, bl)
- if not choices:
+ if not choices and iutil.getPPCMachine() != "iSeries":
dispatch.skipStep("instbootloader")
else:
dispatch.skipStep("instbootloader", skip = 0)