dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0263-10_linux_bls-use-to-separate-id-argument-due-a-Petit.patch

eefaf6
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
eefaf6
From: Javier Martinez Canillas <javierm@redhat.com>
eefaf6
Date: Wed, 19 Jun 2019 15:57:17 +0200
eefaf6
Subject: [PATCH] 10_linux_bls: use '=' to separate --id argument due a
eefaf6
 Petitboot bug
eefaf6
eefaf6
The GRUB menuentry command allows to separate the arguments for options
eefaf6
using either a '=' or a ' '. The latter is the convention used when the
eefaf6
menu entries are defined in the GRUB config file, but this is currently
eefaf6
not supported by Petitboot.
eefaf6
eefaf6
So as a workaround define the menu entries using '--id=${bls}' instead.
eefaf6
eefaf6
Resolves: rhbz#1721815
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
eefaf6
index 175bedd0763..8e07a79322b 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} --users ${grub_users} --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"