mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 14:32:58 +00:00
15a207211f
I don't really need to watch 150+ patches from upstream get applied. Signed-off-by: Peter Jones <pjones@redhat.com>
38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Prarit Bhargava <prarit@redhat.com>
|
|
Date: Wed, 12 Mar 2014 10:58:16 -0400
|
|
Subject: [PATCH] Fix bad test on GRUB_DISABLE_SUBMENU.
|
|
|
|
The file /etc/grub.d/10_linux does
|
|
|
|
if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
|
|
|
|
when it should do
|
|
|
|
if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then
|
|
|
|
which results in submenus in /boot/grub2/grub.cfg when
|
|
GRUB_DISABLE_SUBMENU="yes".
|
|
|
|
Resolves: rhbz#1063414
|
|
---
|
|
util/grub.d/10_linux.in | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
|
index 61ebd7dc714..87a7da34982 100644
|
|
--- a/util/grub.d/10_linux.in
|
|
+++ b/util/grub.d/10_linux.in
|
|
@@ -261,7 +261,11 @@ while [ "x$list" != "x" ] ; do
|
|
fi
|
|
fi
|
|
|
|
- if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
|
|
+ if [ "x${GRUB_DISABLE_SUBMENU}" = "xyes" ] || [ "x${GRUB_DISABLE_SUBMENU}" = "xy" ]; then
|
|
+ GRUB_DISABLE_SUBMENU="true"
|
|
+ fi
|
|
+
|
|
+ if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then
|
|
linux_entry "${OS}" "${version}" simple \
|
|
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
|
|
|