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