diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2008-12-11 11:47:43 +0100 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2008-12-11 11:47:43 +0100 |
| commit | 5719316ade2ca92a8b8098cc2c0b300988c5e37f (patch) | |
| tree | e7464a1a0c7589f877fcb9232b50659502ffb0b5 | |
| parent | 660dc34b691b08a776e02beb47d632f59f485342 (diff) | |
| download | anaconda-5719316ade2ca92a8b8098cc2c0b300988c5e37f.tar.gz anaconda-5719316ade2ca92a8b8098cc2c0b300988c5e37f.tar.xz anaconda-5719316ade2ca92a8b8098cc2c0b300988c5e37f.zip | |
mdraid1: default to putting grub on partition instead of mbr (#217176)
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 us 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.
| -rw-r--r-- | bootloader.py | 3 | ||||
| -rw-r--r-- | fsset.py | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/bootloader.py b/bootloader.py index 29bb9c247..dcc989927 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]) @@ -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 |