summaryrefslogtreecommitdiffstats
path: root/pyanaconda/bootloader.py
diff options
context:
space:
mode:
authorDavid Lehman <dlehman@redhat.com>2012-09-13 10:58:44 -0500
committerDavid Lehman <dlehman@redhat.com>2012-09-17 09:49:19 -0500
commit2317001a66dd37f6d2409eb9f26785e8c4e68162 (patch)
treeb97e9eab284eae7e2a40c3cf15c13917915a95f2 /pyanaconda/bootloader.py
parente9f081a0c3571b9a04ce42d5e63ee83e64ee2372 (diff)
downloadanaconda-2317001a66dd37f6d2409eb9f26785e8c4e68162.tar.gz
anaconda-2317001a66dd37f6d2409eb9f26785e8c4e68162.tar.xz
anaconda-2317001a66dd37f6d2409eb9f26785e8c4e68162.zip
Don't allow stage2 as stage1 unless specified via location.
This prevents automatic selection of stage2 as stage1, which is something we never want to happen.
Diffstat (limited to 'pyanaconda/bootloader.py')
-rw-r--r--pyanaconda/bootloader.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index 22e4031eb..b0aff48bf 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -565,7 +565,8 @@ class BootLoader(object):
if self.stage2_is_valid_stage1 and device == self.stage2_device:
# special case
- valid = self.is_valid_stage2_device(device)
+ valid = (self.stage2_is_preferred_stage1 and
+ self.is_valid_stage2_device(device))
# we'll be checking stage2 separately so don't duplicate messages
self.problems = []