Attachment 7627 Details for Bug 18112 – do not overwrite GRUB_CMDLINE_LINUX_DEFAULT once it has been set

[patch] do not overwrite GRUB_CMDLINE_LINUX_DEFAULT once it has been set

18112.diff (text/plain), 607 bytes, created by Thierry Vignaud on 2016-04-04 23:40:43 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2016-04-04 23:40:43 CEST

Size: 607 bytes

patch

obsolete

diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 6ffca62..59f0cec 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1805,7 +1805,7 @@ sub write_grub2 {
 
     my $f = "$::prefix/etc/default/grub";
     my %conf = getVarsFromSh($f);
-    $conf{GRUB_CMDLINE_LINUX_DEFAULT} = get_grub2_append($bootloader);
+    $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};

Actions: View | Diff

Attachments on bug 18112: 7626 | 7627 | 7628 | 7629