dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

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

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