summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cantrell <dcantrell@redhat.com>2007-02-12 22:11:02 +0000
committerDavid Cantrell <dcantrell@redhat.com>2007-02-12 22:11:02 +0000
commit6b4b749f67d22e6a43c1b3c7f9ecfd0f9f63dbb1 (patch)
tree0e2b3baade5b1ee3db34f37f68c7a982e2810aeb
parentf2adf32166c3ce2da20092929d9db46cb6b01235 (diff)
downloadanaconda-6b4b749f67d22e6a43c1b3c7f9ecfd0f9f63dbb1.tar.gz
anaconda-6b4b749f67d22e6a43c1b3c7f9ecfd0f9f63dbb1.tar.xz
anaconda-6b4b749f67d22e6a43c1b3c7f9ecfd0f9f63dbb1.zip
2007-02-12 David Cantrell <dcantrell@redhat.com>
* fsset.py (FileSystemSet.bootloaderChoices): On zFCP-only zSeries instances, do not try to grab bl.drivelist[0] when figuring out what boot loader choices the user has (#165098).
-rw-r--r--ChangeLog6
-rw-r--r--fsset.py6
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bae84e371..00bc7667a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-12 David Cantrell <dcantrell@redhat.com>
+
+ * fsset.py (FileSystemSet.bootloaderChoices): On zFCP-only zSeries
+ instances, do not try to grab bl.drivelist[0] when figuring out what
+ boot loader choices the user has (#165098).
+
2007-02-09 Peter Jones <pjones@redhat.com>
* anaconda.spec: Bump version.
diff --git a/fsset.py b/fsset.py
index 3a26cfb60..2504aaa30 100644
--- a/fsset.py
+++ b/fsset.py
@@ -1249,7 +1249,11 @@ MAILADDR root
return ret
ret['boot'] = (bootDev.device, N_("First sector of boot partition"))
- ret['mbr'] = (bl.drivelist[0], N_("Master Boot Record (MBR)"))
+ try:
+ # we won't have this on zFCP-only zSeries systems
+ ret['mbr'] = (bl.drivelist[0], N_("Master Boot Record (MBR)"))
+ except:
+ pass
return ret
# set active partition on disks