From acc69bdddc50262b8f91034c248279d8dc734284 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Mon, 16 Feb 2015 12:23:31 +0100 Subject: defaultenv-2: init: don't call timeout again if the user intervened With autoboot_timeout=0 the second 'timeout' might not get another character even if the user keeps a key pressed. So just reuse the key from the first call. Signed-off-by: Michael Olbrich Signed-off-by: Sascha Hauer --- defaultenv/defaultenv-2-base/bin/init | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'defaultenv') diff --git a/defaultenv/defaultenv-2-base/bin/init b/defaultenv/defaultenv-2-base/bin/init index 34807bcf58..30651e55d2 100644 --- a/defaultenv/defaultenv-2-base/bin/init +++ b/defaultenv/defaultenv-2-base/bin/init @@ -37,6 +37,7 @@ fi # allow to stop the boot before execute the /env/init/* # but without waiting timeout -s -a -v key 0 +autoboot="$?" if [ "${key}" = "q" ]; then ${login_cmd} @@ -57,8 +58,10 @@ fi [ -n ${login_cmd} ] && global.console.input_allow=1 -timeout -a $global.autoboot_timeout -v key -autoboot="$?" +if [ "$autoboot" = 0 ]; then + timeout -a $global.autoboot_timeout -v key + autoboot="$?" +fi [ -n ${login_cmd} ] && global.console.input_allow=0 -- cgit v1.2.3