forked from pool/grub2
46 lines
1.1 KiB
Diff
46 lines
1.1 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(-)
|
||
|
|
|
||
|
|
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
|
||
|
|
index f495f85..d1c7916 100644
|
||
|
|
--- a/util/grub.d/00_header.in
|
||
|
|
+++ b/util/grub.d/00_header.in
|
||
|
|
@@ -280,13 +280,19 @@ make_timeout ()
|
||
|
|
verbose=" --verbose"
|
||
|
|
fi
|
||
|
|
cat << EOF
|
||
|
|
-if sleep$verbose --interruptible ${1} ; then
|
||
|
|
+if [ x\${boot_once} = xtrue ]; then
|
||
|
|
+ set timeout=0
|
||
|
|
+elif sleep$verbose --interruptible ${1} ; then
|
||
|
|
set timeout=${2}
|
||
|
|
fi
|
||
|
|
EOF
|
||
|
|
else
|
||
|
|
cat << EOF
|
||
|
|
-set timeout=${2}
|
||
|
|
+if [ x\${boot_once} = xtrue ]; then
|
||
|
|
+ set timeout=0
|
||
|
|
+else
|
||
|
|
+ set timeout=${2}
|
||
|
|
+fi
|
||
|
|
EOF
|
||
|
|
fi
|
||
|
|
}
|
||
|
|
--
|
||
|
|
1.7.10.4
|
||
|
|
|