From da8422ff1d6448480f80f582eaae625c72bd4c26 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Tue, 31 May 2016 19:21:11 +0200
Subject: only overwrite GRUB_CMDLINE_LINUX_DEFAULT on first install
 (mga#18112)

---
 perl-install/NEWS          | 2 ++
 perl-install/bootloader.pm | 6 +++++-
 perl-install/install/NEWS  | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'perl-install')

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
-- 
cgit v1.2.1