2764c99fe0
I think it is good time to update to 2.02 so it can get more testing. Although internal changes are pretty extensive, externally it should be pretty much the same. The main user visible changes are - autogen is not used anymore, so we can finally simplify patches and recreate files during RPM build. So generated files need not be patched and shipped any more. - GRUB_HIDDEN_TIMEOUT is deprecated, we should use GRUB_TIMEOUT_STYLE instead. This will need perl-Bootloader and YaST changes. Old config is still accpepted so nothing should be broken. - native pvgrub2 support for Xen PV guests. - ARM support (32 and 64 bit), although it has rough edges. OBS-URL: https://build.opensuse.org/request/show/212604 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=62
32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
From 78270522e8b8c0674941e0752c245dd8468e5bf8 Mon Sep 17 00:00:00 2001
|
|
From: Michael Chang <mchang@suse.com>
|
|
Date: Wed, 1 Aug 2012 15:46:34 +0800
|
|
Subject: [PATCH] not display menu when boot once
|
|
|
|
References: bnc#771587
|
|
Patch-Mainline: no
|
|
|
|
We should prevent the menu from being displayed if boot once is
|
|
specified. This is in order to compliant with Grub1's behavior
|
|
and is better than current as it's not make any sense to bother
|
|
user to make decision when decision has been made.
|
|
---
|
|
util/grub.d/00_header.in | 10 ++++++++--
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
Index: grub-2.02~beta2/util/grub.d/00_header.in
|
|
===================================================================
|
|
--- grub-2.02~beta2.orig/util/grub.d/00_header.in
|
|
+++ grub-2.02~beta2/util/grub.d/00_header.in
|
|
@@ -304,7 +304,9 @@ make_timeout ()
|
|
style="menu"
|
|
fi
|
|
cat << EOF
|
|
-if [ x\$feature_timeout_style = xy ] ; then
|
|
+if [ x\${boot_once} = xtrue ]; then
|
|
+ set timeout=0
|
|
+elif [ x\$feature_timeout_style = xy ] ; then
|
|
set timeout_style=${style}
|
|
set timeout=${timeout}
|
|
EOF
|