Allow bootloader on mbr when /boot is dmraid1 (#217176)

This patch allows installing the bootloader on the mbr when using mdraid1,
as requested in bug 217176.

It also contains some special handling of this case in bootloader.py,
to make sure our default behaviour does not change.

2 files changed, 7 insertions, 1 deletions

diff --git a/bootloader.py b/bootloader.py
index 486cb64a2..d88da31a9 100644
--- a/bootloader.py
+++ b/bootloader.py
@@ -85,7 +85,8 @@ def bootloaderSetupChoices(dispatch, bl, fsset, diskSet, dir):
             log("MBR not suitable as boot device; installing to partition")
             bl.defaultDevice = "boot"
         bl.setDevice(choices[bl.defaultDevice][0])
-    elif choices and choices.has_key("mbr"):
+    elif choices and choices.has_key("mbr") and not \
+         (choices.has_key("boot") and choices["boot"][1] == N_("RAID Device")):
         bl.setDevice(choices["mbr"][0])
     elif choices and choices.has_key("boot"):
         bl.setDevice(choices["boot"][0])
diff --git a/fsset.py b/fsset.py
index 22fd824b2..cee9ef70f 100644
--- a/fsset.py
+++ b/fsset.py
@@ -1340,6 +1340,11 @@ MAILADDR root
 
 	if bootDev.getName() == "RAIDDevice":
             ret['boot'] = (bootDev.device, N_("RAID Device"))
+            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
 
         if iutil.getPPCMacGen() == "NewWorld":