dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0242-don-t-set-saved_entry-on-grub2-mkconfig.patch

8631a2
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
8631a2
From: Javier Martinez Canillas <javierm@redhat.com>
8631a2
Date: Fri, 19 Oct 2018 14:42:41 +0200
8631a2
Subject: [PATCH] don't set saved_entry on grub2-mkconfig
8631a2
8631a2
The original plan was for grub2 to rely on the BLS sort criteria to choose
8631a2
the default entry to boot, to avoid modifying any files when a new kernel
8631a2
was installed. But that was changed and now 20-grub.install changes the
8631a2
default, so 10_linux{,bls} shouldn't overwrite this.
8631a2
8631a2
Resolves: rhbz#1636466
8631a2
8631a2
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
8631a2
---
8631a2
 util/grub.d/10_linux.in     | 1 -
8631a2
 util/grub.d/10_linux_bls.in | 1 -
8631a2
 2 files changed, 2 deletions(-)
8631a2
8631a2
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
8631a2
index 01e66e5fc74..b54d2774a7d 100644
8631a2
--- a/util/grub.d/10_linux.in
8631a2
+++ b/util/grub.d/10_linux.in
8631a2
@@ -165,7 +165,6 @@ if [ -s \$prefix/grubenv ]; then
8631a2
 fi
8631a2
 EOF
8631a2
 
8631a2
-    ${grub_editenv} - set saved_entry=0
8631a2
     if ! grub2-editenv - list | grep -q kernelopts; then
8631a2
 	${grub_editenv} - set kernelopts="root=${linux_root_device_thisversion} ro ${args}"
8631a2
     fi
8631a2
diff --git a/util/grub.d/10_linux_bls.in b/util/grub.d/10_linux_bls.in
8631a2
index 1bc97f29898..8745e598d0e 100644
8631a2
--- a/util/grub.d/10_linux_bls.in
8631a2
+++ b/util/grub.d/10_linux_bls.in
8631a2
@@ -212,7 +212,6 @@ linux_entry ()
8631a2
     populate_header_warn
8631a2
     populate_menu
8631a2
 
8631a2
-    ${grub_editenv} - set saved_entry=0
8631a2
     if ! grub2-editenv - list | grep -q kernelopts; then
8631a2
 	${grub_editenv} - set kernelopts="root=${linux_root_device_thisversion} ro ${args}"
8631a2
     fi