* [PATCH] defaultenv/bin/init: skip autoboot if $autoboot_timeout is unset
@ 2012-06-25 12:06 Jan Luebbe
2012-06-25 17:21 ` Sascha Hauer
0 siblings, 1 reply; 2+ messages in thread
From: Jan Luebbe @ 2012-06-25 12:06 UTC (permalink / raw)
To: barebox
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] defaultenv/bin/init: skip autoboot if $autoboot_timeout is unset
2012-06-25 12:06 [PATCH] defaultenv/bin/init: skip autoboot if $autoboot_timeout is unset Jan Luebbe
@ 2012-06-25 17:21 ` Sascha Hauer
0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2012-06-25 17:21 UTC (permalink / raw)
To: Jan Luebbe; +Cc: barebox
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-06-25 17:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-25 12:06 [PATCH] defaultenv/bin/init: skip autoboot if $autoboot_timeout is unset Jan Luebbe
2012-06-25 17:21 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox