Attachment 9117 Details for Bug 18783 – better fix for mga#18783

better fix for mga#18783

0002-better-fix-for-mga-18783.patch (text/plain), 1.22 KB, created by Thierry Vignaud on 2017-03-19 04:00:41 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2017-03-19 04:00:41 CET

Size: 1.22 KB

patch

obsolete

>From 87e2041e8e57ed0e2839c20dee01eff634a327fd Mon Sep 17 00:00:00 2001
>From: Thierry Vignaud <thierry.vignaud@gmail.com>
>Date: Sun, 19 Mar 2017 03:58:21 +0100
>Subject: [PATCH 2/2] better fix for mga#18783
>
>only add 'GRUB_DEFAULT' field if not already existing, thus fixing using
>"0" as value
>---
> perl-install/bootloader.pm | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
>index 8983dd6..2b288be 100644
>--- a/perl-install/bootloader.pm
>+++ b/perl-install/bootloader.pm
>@@ -1869,7 +1869,7 @@ sub write_grub2_sysconfig {
>     $conf{GRUB_CMDLINE_LINUX_DEFAULT} = $bootloader->{default_append} || get_grub2_append($bootloader);
>     $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_DEFAULT} = 'saved' if !defined $conf{GRUB_DEFAULT}; # 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'));
>-- 
>2.9.3
>

From 87e2041e8e57ed0e2839c20dee01eff634a327fd Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Sun, 19 Mar 2017 03:58:21 +0100
Subject: [PATCH 2/2] better fix for mga#18783

only add 'GRUB_DEFAULT' field if not already existing, thus fixing using
"0" as value
---
 perl-install/bootloader.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 8983dd6..2b288be 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1869,7 +1869,7 @@ sub write_grub2_sysconfig {
     $conf{GRUB_CMDLINE_LINUX_DEFAULT} = $bootloader->{default_append} || get_grub2_append($bootloader);
     $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_DEFAULT} = 'saved' if !defined $conf{GRUB_DEFAULT}; # 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'));
-- 
2.9.3

Actions: View

Attachments on bug 18783: 9116 | 9117