On Tue, Jan 15, 2013 at 09:43:32PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> so we can have splash, usb serial, etc...
>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Applied, thanks
Sascha
> ---
> defaultenv-2/base/bin/init | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/defaultenv-2/base/bin/init b/defaultenv-2/base/bin/init
> index 2a1f6a1..b606b63 100644
> --- a/defaultenv-2/base/bin/init
> +++ b/defaultenv-2/base/bin/init
> @@ -21,8 +21,9 @@ else
> echo -e -n "\nHit any key to stop autoboot: "
> fi
>
> -timeout -a $global.autoboot_timeout -v key
> -autoboot="$?"
> +# allow to stop the boot before execute the /env/init/*
> +# but without waiting
> +timeout -s -a -v key 0
>
> if [ "${key}" = "q" ]; then
> exit
> @@ -32,6 +33,13 @@ for i in /env/init/*; do
> . $i
> done
>
> +timeout -a $global.autoboot_timeout -v key
> +autoboot="$?"
> +
> +if [ "${key}" = "q" ]; then
> + exit
> +fi
> +
> if [ "$autoboot" = 0 ]; then
> boot
> fi
> --
> 1.7.10.4
>
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> 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@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
