|
 |
eefaf6 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
eefaf6 |
From: Javier Martinez Canillas <javierm@redhat.com>
|
|
|
eefaf6 |
Date: Thu, 28 Mar 2019 16:34:42 +0100
|
|
|
eefaf6 |
Subject: [PATCH] 10_linux_bls: don't add --users option to generated menu
|
|
|
eefaf6 |
entries
|
|
|
eefaf6 |
|
|
|
eefaf6 |
The generated menu entries have a --users $grub_users option but this will
|
|
|
eefaf6 |
fail on old versions of GRUB, since it expects the --users option argument
|
|
|
eefaf6 |
to either be a constant or a variable that has been set.
|
|
|
eefaf6 |
|
|
|
eefaf6 |
The latest GRUB version fix this but the GRUB core isn't updated on a GRUB
|
|
|
eefaf6 |
package update, so this will cause the entries to not be shown in the menu
|
|
|
eefaf6 |
after a system upgrade.
|
|
|
eefaf6 |
|
|
|
eefaf6 |
Since can cause issues and because the entries that weren't generated from
|
|
|
eefaf6 |
the BLS snippets didn't have the --users option either, just don't add it.
|
|
|
eefaf6 |
|
|
|
eefaf6 |
Resolves: rhbz#1755815
|
|
|
eefaf6 |
|
|
|
eefaf6 |
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
|
eefaf6 |
---
|
|
|
eefaf6 |
util/grub.d/10_linux_bls.in | 2 +-
|
|
|
eefaf6 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
eefaf6 |
|
|
|
eefaf6 |
diff --git a/util/grub.d/10_linux_bls.in b/util/grub.d/10_linux_bls.in
|
|
|
f6e916 |
index 8e07a7932..855dbdd19 100644
|
|
|
eefaf6 |
--- a/util/grub.d/10_linux_bls.in
|
|
|
eefaf6 |
+++ b/util/grub.d/10_linux_bls.in
|
|
|
eefaf6 |
@@ -180,7 +180,7 @@ populate_menu()
|
|
|
eefaf6 |
for bls in "${files[@]}" ; do
|
|
|
eefaf6 |
read_config "${blsdir}/${bls}.conf"
|
|
|
eefaf6 |
|
|
|
eefaf6 |
- menu="${menu}menuentry '${title}' --class ${grub_class} ${grub_arg} --users ${grub_users} --id=${bls} {\n"
|
|
|
eefaf6 |
+ menu="${menu}menuentry '${title}' --class ${grub_class} ${grub_arg} --id=${bls} {\n"
|
|
|
eefaf6 |
menu="${menu}\t linux ${linux} ${options}\n"
|
|
|
eefaf6 |
if [ -n "${initrd}" ] ; then
|
|
|
eefaf6 |
menu="${menu}\t initrd ${boot_prefix}${initrd}\n"
|