Hi all,
As previously discussed we do want to allow installing the bootloader on the
MBR in the raid 1 case (which until some time ago we did not allow) (#217176),
but we do not want to change our current default of installing to the partition
(which gives is the mirror redundancy, due to special handling in booty).
This patch effectively reverts commit 48d582347492493c87b2b368394fd8e7342688bc,
which removed the raid1 case special handling, and then adds mbr support to the
raid special case in fsset.py, and add some special case handling to
bootloader.py to not default to the mbr in this case.
Regards,
Hans
diff --git a/bootloader.py b/bootloader.py
index 29bb9c2..dcc9899 100644
--- a/bootloader.py
+++ b/bootloader.py
@@ -119,7 +119,8 @@ def bootloaderSetupChoices(anaconda):
anaconda.id.bootloader.setDevice(choices[anaconda.id.bootloader.defaultDevice][0])
elif choices and iutil.isMactel() and choices.has_key("boot"): # haccckkkk
anaconda.id.bootloader.setDevice(choices["boot"][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")):
anaconda.id.bootloader.setDevice(choices["mbr"][0])
elif choices and choices.has_key("boot"):
anaconda.id.bootloader.setDevice(choices["boot"][0])
diff --git a/fsset.py b/fsset.py
index 9d798eb..497ccfa 100644
--- a/fsset.py
+++ b/fsset.py
@@ -1537,6 +1537,11 @@ MAILADDR root
ret['boot'] = (bootDev.device, N_("EFI System Partition"))
return ret
+ if bootDev.getName() == "RAIDDevice":
+ ret['boot'] = (bootDev.device, N_("RAID Device"))
+ ret['mbr'] = (bl.drivelist[0], N_("Master Boot Record (MBR)"))
+ return ret
+
if iutil.getPPCMacGen() == "NewWorld":
ret['boot'] = (bootDev.device, N_("Apple Bootstrap"))
n = 1
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
