Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1iAFmE-0001eY-O3 for mharc-grub-devel@gnu.org; Tue, 17 Sep 2019 11:52:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38251) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAFmA-0001au-OB for grub-devel@gnu.org; Tue, 17 Sep 2019 11:52:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAFm8-00087f-LR for grub-devel@gnu.org; Tue, 17 Sep 2019 11:52:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35882) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iAFm7-000870-Mg for grub-devel@gnu.org; Tue, 17 Sep 2019 11:52:20 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 529233A206 for ; Tue, 17 Sep 2019 15:52:18 +0000 (UTC) Received: by mail-wm1-f70.google.com with SMTP id f10so1035834wmh.8 for ; Tue, 17 Sep 2019 08:52:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=zh7oHjukdOnwM/BmUeXs3Nk28EXNuAJZqBcRa1TA/u0=; b=Ep2JZ+oUEP+VYe0M5kJj5VVwM9wGf+ZSN1WEdhpvYHIwnVjWK0JEiQXFxEtQXl4U+I RB0ccyT5M5135DUXeaHcCRR7kMM/ZYEKX6HMTG/FIHpAEMhnQVI4dIyQzqSRln4kVa/d kK0U/XRLsoERf/Hw6EX0iToHqHIX9V/yECpqmjj0yjdfgTpVSplthFUrfminYJ/kQRXt bFUPSA/E3yro4in/9u0HWdd+9yDw5iaYpq1jTLIm5+dcBxPYEuU7ziFZvts/3M3tHxE7 xah2SOOq6M697cmzUdyZDEtOINt1w9HyNaO5Cy7SfRDMwgbrzDJx8lBaxCZ06pCjXtjt GmBw== X-Gm-Message-State: APjAAAUkdjtZ48zPHP3V+Ey5kXo5LRKc+aSY8yUJDl9/CJJwzrLcPVCo uaYgUH5c3mA/eSxxRVjntjxt2jdyyweV1lrharuHId7mf7WLZd5GEgqm6W3HcJCLi4aVN4W5kKV exWB3L5bZzug= X-Received: by 2002:a05:6000:108e:: with SMTP id y14mr3458795wrw.344.1568735536770; Tue, 17 Sep 2019 08:52:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqx+TW4rzBpHR1uLGAE0FtruJrXSNvJ91A5oc7FuaJdTteKO4CsrTULjlfd2ZPpYKR82etnvnA== X-Received: by 2002:a05:6000:108e:: with SMTP id y14mr3458786wrw.344.1568735536602; Tue, 17 Sep 2019 08:52:16 -0700 (PDT) Received: from minerva.redhat.com ([90.168.169.92]) by smtp.gmail.com with ESMTPSA id x6sm4015913wmf.38.2019.09.17.08.52.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Sep 2019 08:52:16 -0700 (PDT) From: Javier Martinez Canillas To: grub-devel@gnu.org Cc: Prarit Bhargava , Javier Martinez Canillas , Vladimir Serbinenko , Daniel Kiper Subject: [PATCH] Fix bad test on GRUB_DISABLE_SUBMENU. Date: Tue, 17 Sep 2019 17:52:10 +0200 Message-Id: <20190917155210.4062-1-javierm@redhat.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2019 15:52:25 -0000 From: Prarit Bhargava The file /etc/grub.d/10_linux does if [ "x$is_top_level" =3D xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" !=3D xy= ]; then when it should do if [ "x$is_top_level" =3D xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" !=3D xt= rue ]; then which results in submenus in /boot/grub2/grub.cfg when GRUB_DISABLE_SUBMENU=3D"yes". Resolves: rhbz#1063414 Signed-off-by: Prarit Bhargava Signed-off-by: Javier Martinez Canillas --- 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 4532266be68..58defdbd83f 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -261,7 +261,11 @@ while [ "x$list" !=3D "x" ] ; do fi fi =20 - if [ "x$is_top_level" =3D xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" !=3D= xy ]; then + if [ "x${GRUB_DISABLE_SUBMENU}" =3D "xyes" ] || [ "x${GRUB_DISABLE_SUB= MENU}" =3D "xy" ]; then + GRUB_DISABLE_SUBMENU=3D"true" + fi + + if [ "x$is_top_level" =3D xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" !=3D= xtrue ]; then linux_entry "${OS}" "${version}" simple \ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" =20 --=20 2.21.0