[PATCH] defaultenv/bin/init: skip autoboot if $autoboot_timeout is unset

[PATCH] defaultenv/bin/init: skip autoboot if $autoboot_timeout is unset

[Jan Luebbe]

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
 defaultenv/bin/init |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaultenv/bin/init b/defaultenv/bin/init
index 6e85a82..f535e37 100644
--- a/defaultenv/bin/init
+++ b/defaultenv/bin/init
@@ -23,7 +23,7 @@ fi
 
 if [ -f /env/bin/boot_board ]; then
 	. /env/bin/boot_board
-else
+elif [ -n $autoboot_timeout ]; then
 	echo
 	echo -n "Hit any key to stop autoboot: "
 	timeout -a $autoboot_timeout
-- 
1.7.10


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

Re: [PATCH] defaultenv/bin/init: skip autoboot if $autoboot_timeout is unset

[Sascha Hauer]

On Mon, Jun 25, 2012 at 02:06:00PM +0200, Jan Luebbe wrote:
> Signed-off-by: Jan Luebbe <jlu@pengutronix.de>

Applied, thanks

Sascha

> ---
>  defaultenv/bin/init |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/defaultenv/bin/init b/defaultenv/bin/init
> index 6e85a82..f535e37 100644
> --- a/defaultenv/bin/init
> +++ b/defaultenv/bin/init
> @@ -23,7 +23,7 @@ fi
>  
>  if [ -f /env/bin/boot_board ]; then
>  	. /env/bin/boot_board
> -else
> +elif [ -n $autoboot_timeout ]; then
>  	echo
>  	echo -n "Hit any key to stop autoboot: "
>  	timeout -a $autoboot_timeout
> -- 
> 1.7.10
> 
> 
> _______________________________________________
> 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