diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-05-31 19:21:11 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-06-06 10:35:57 +0200 |
| commit | da8422ff1d6448480f80f582eaae625c72bd4c26 (patch) | |
| tree | d70ca6bda30d4330653bf185840d573fd2218e20 /perl-install | |
| parent | c9eb5ee182d8cec12c9b17aa85dcac72bacf4b5f (diff) | |
| download | drakx-da8422ff1d6448480f80f582eaae625c72bd4c26.tar drakx-da8422ff1d6448480f80f582eaae625c72bd4c26.tar.gz drakx-da8422ff1d6448480f80f582eaae625c72bd4c26.tar.bz2 drakx-da8422ff1d6448480f80f582eaae625c72bd4c26.tar.xz drakx-da8422ff1d6448480f80f582eaae625c72bd4c26.zip | |
only overwrite GRUB_CMDLINE_LINUX_DEFAULT on first install (mga#18112)
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 6 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index db9743e06..fb2781650 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- drakboot: + o only overwrite GRUB_CMDLINE_LINUX_DEFAULT on first install (mga#18112) - running commands as user: o fix the fallback when the helper didn't provide the real UID (mga#18288) o guess the right user after the switch to polkit (mga#18288) diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 247125b28..e6409a62e 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1805,7 +1805,11 @@ sub write_grub2 { my $f = "$::prefix/etc/default/grub"; my %conf = getVarsFromSh($f); - $conf{GRUB_CMDLINE_LINUX_DEFAULT} = get_grub2_append($bootloader); + + # First installation or migration from grub-legacy/lilo? + if (! -f get_grub2_install_sh()) { + $conf{GRUB_CMDLINE_LINUX_DEFAULT} = get_grub2_append($bootloader); + } $conf{GRUB_GFXPAYLOAD_LINUX} = 'auto' if is_uefi(); $conf{GRUB_DISABLE_RECOVERY} = 'false'; # for 'failsafe' entry $conf{GRUB_TIMEOUT} = $bootloader->{timeout}; diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 9c1fcc585..82822d580 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- bootloader: + o only overwrite GRUB_CMDLINE_LINUX_DEFAULT on first install (mga#18112) + Version 17.33 - 27 May 2016 - adjust to latest gdb |