[PATCH] defaultenv-2: init: display prompt after running /env/init/*

[PATCH] defaultenv-2: init: display prompt after running /env/init/*

[Jan Luebbe]

This allows init scripts to print messages to the console without messing
up the timeout prompt.

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
 defaultenv-2/base/bin/init |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/defaultenv-2/base/bin/init b/defaultenv-2/base/bin/init
index 6a658d1..ca02ba6 100644
--- a/defaultenv-2/base/bin/init
+++ b/defaultenv-2/base/bin/init
@@ -16,12 +16,6 @@ global editcmd=sedit
 [ -e /env/config-board ] && /env/config-board
 /env/config
 
-if [ -e /env/menu ]; then
-	echo -e -n "\nHit m for menu or any other key to stop autoboot: "
-else
-	echo -e -n "\nHit any key to stop autoboot: "
-fi
-
 # allow to stop the boot before execute the /env/init/*
 # but without waiting
 timeout -s -a -v key 0
@@ -34,6 +28,12 @@ for i in /env/init/*; do
 	. $i
 done
 
+if [ -e /env/menu ]; then
+	echo -e -n "\nHit m for menu or any other key to stop autoboot: "
+else
+	echo -e -n "\nHit any key to stop autoboot: "
+fi
+
 timeout -a $global.autoboot_timeout -v key
 autoboot="$?"
 
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] defaultenv-2: init: display prompt after running /env/init/*

[Sascha Hauer]

On Wed, Apr 17, 2013 at 07:14:12PM +0200, Jan Luebbe wrote:
> This allows init scripts to print messages to the console without messing
> up the timeout prompt.
> 
> Signed-off-by: Jan Luebbe <jlu@pengutronix.de>

Applied, thanks

Sascha

> ---
>  defaultenv-2/base/bin/init |   12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/defaultenv-2/base/bin/init b/defaultenv-2/base/bin/init
> index 6a658d1..ca02ba6 100644
> --- a/defaultenv-2/base/bin/init
> +++ b/defaultenv-2/base/bin/init
> @@ -16,12 +16,6 @@ global editcmd=sedit
>  [ -e /env/config-board ] && /env/config-board
>  /env/config
>  
> -if [ -e /env/menu ]; then
> -	echo -e -n "\nHit m for menu or any other key to stop autoboot: "
> -else
> -	echo -e -n "\nHit any key to stop autoboot: "
> -fi
> -
>  # allow to stop the boot before execute the /env/init/*
>  # but without waiting
>  timeout -s -a -v key 0
> @@ -34,6 +28,12 @@ for i in /env/init/*; do
>  	. $i
>  done
>  
> +if [ -e /env/menu ]; then
> +	echo -e -n "\nHit m for menu or any other key to stop autoboot: "
> +else
> +	echo -e -n "\nHit any key to stop autoboot: "
> +fi
> +
>  timeout -a $global.autoboot_timeout -v key
>  autoboot="$?"
>  
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox