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