Re: [PATCH 2/2] Allow bootloader on mbr when /boot is mdraid1 (#475973)

[Joel Granados <jgranado redhat com>]

looks ok.
On Wed, May 06, 2009 at 01:58:55PM +0200, Hans de Goede wrote:
> This patch allows installing the bootloader on the mbr when using mdraid1.
> It also contains some special handling of this case in bootloader.py,
> to make sure our default behaviour does not change.
> 
> This is a forward port of the same patch for 4.8:
> http://git.fedorahosted.org/git/?p=anaconda.git;a=commitdiff_plain;h=1263e881d7029c85bb0cca42abd5851827751d17
> ---
>  bootloader.py |    3 ++-
>  fsset.py      |    5 +++++
>  2 files changed, 7 insertions(+), 1 deletions(-)
> 
> diff --git a/bootloader.py b/bootloader.py
> index 31bb9fa..940478d 100644
> --- a/bootloader.py
> +++ b/bootloader.py
> @@ -85,7 +85,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 f39e7fb..a7aebd2 100644
> --- a/fsset.py
> +++ b/fsset.py
> @@ -1611,6 +1611,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":
> -- 
> 1.6.2.2
> 
> _______________________________________________
> Anaconda-devel-list mailing list
> Anaconda-devel-list redhat com
> https://www.redhat.com/mailman/listinfo/anaconda-devel-list

-- 
Joel Andres Granados
Brno, Czech Republic, Red Hat.