diff options
| author | Thierry Vignaud <tvignaud@redhat.com> | 2016-05-27 16:38:51 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-06-06 10:35:57 +0200 |
| commit | ad128f02d165f26d7eec3781952f108efb588c67 (patch) | |
| tree | f246876fcd07267e27b95497a0f15755699a7a4e | |
| parent | da8422ff1d6448480f80f582eaae625c72bd4c26 (diff) | |
| download | drakx-ad128f02d165f26d7eec3781952f108efb588c67.tar drakx-ad128f02d165f26d7eec3781952f108efb588c67.tar.gz drakx-ad128f02d165f26d7eec3781952f108efb588c67.tar.bz2 drakx-ad128f02d165f26d7eec3781952f108efb588c67.tar.xz drakx-ad128f02d165f26d7eec3781952f108efb588c67.zip | |
grub2: set GRUB_DEFAULT + GRUB_SAVEDEFAULT
else grub2-set-default won't work (mga#9627, mga#16059)
but do not overwrite it if user has changed its value
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index fb2781650..363a996f0 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,5 +1,6 @@ - drakboot: o only overwrite GRUB_CMDLINE_LINUX_DEFAULT on first install (mga#18112) + o set GRUB_DEFAULT + GRUB_SAVEDEFAULT (mga#9627, mga#16059) - 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 e6409a62e..8e70805e1 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -1812,6 +1812,8 @@ sub write_grub2 { } $conf{GRUB_GFXPAYLOAD_LINUX} = 'auto' if is_uefi(); $conf{GRUB_DISABLE_RECOVERY} = 'false'; # for 'failsafe' entry + $conf{GRUB_DEFAULT} ||= 'saved'; # for default entry but do not overwrite user choice + $conf{GRUB_SAVEDEFAULT} ||= 'true'; # for default entry but do not overwrite user choice $conf{GRUB_TIMEOUT} = $bootloader->{timeout}; renamef($f, $f . ($o_backup_extension || '.old')); setVarsInSh($f, \%conf); diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 82822d580..439aef944 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,6 @@ - bootloader: o only overwrite GRUB_CMDLINE_LINUX_DEFAULT on first install (mga#18112) + o set GRUB_DEFAULT + GRUB_SAVEDEFAULT (mga#9627, mga#16059) Version 17.33 - 27 May 2016 |