dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0265-10_linux_bls-don-t-add-users-option-to-generated-men.patch

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