diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-07-23 16:18:49 +0100 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2018-01-09 22:58:52 +0200 |
| commit | 6fb73fba36f9fcf88251f3bd3ad8ee67950c8541 (patch) | |
| tree | b16516823395a3f94b61739dc740fcf66437796b /perl-install/any.pm | |
| parent | 14fe8140dfa87211854877002217f44aa02318ea (diff) | |
| download | drakx-6fb73fba36f9fcf88251f3bd3ad8ee67950c8541.tar drakx-6fb73fba36f9fcf88251f3bd3ad8ee67950c8541.tar.gz drakx-6fb73fba36f9fcf88251f3bd3ad8ee67950c8541.tar.bz2 drakx-6fb73fba36f9fcf88251f3bd3ad8ee67950c8541.tar.xz drakx-6fb73fba36f9fcf88251f3bd3ad8ee67950c8541.zip | |
Combine bootloader perImageAppend and default_append keys.
This allows changes to the append options to propagate to the grub2
configuration file, thus fixing mga#21263 and mga#21250.
Diffstat (limited to 'perl-install/any.pm')
| -rw-r--r-- | perl-install/any.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index e56f6711a..376240aac 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -626,7 +626,7 @@ sub setupBootloader__grub2 { my $b2 = bootloader::read_grub2(); # get default parameters: - my $append = $b->{default_append} || $b->{entries}[0]{append} || bootloader::get_grub2_append($b2); + my $append = $b->{perImageAppend} || bootloader::get_grub2_append($b2); my $default = $b2->{default}; require Xconfig::resolution_and_depth; @@ -661,7 +661,7 @@ sub setupBootloader__grub2 { $b->{entries} = $b2->{entries}; $b->{default} = $default; $b->{vga} = ref($vga) ? $vga->{bios} : $vga; - $b->{default_append} = $append; + $b->{perImageAppend} = $append; if ($os_prober) { $in->do_pkgs->ensure_is_installed('os-prober', '/usr/bin/os-prober'); } else { |