From: Sascha Hauer <s.hauer@pengutronix.de>
To: Jan Luebbe <jlu@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] defaultenv-2: init: display prompt after running /env/init/*
Date: Wed, 24 Apr 2013 07:56:36 +0200 [thread overview]
Message-ID: <20130424055636.GY32299@pengutronix.de> (raw)
In-Reply-To: <1366218852-30912-1-git-send-email-jlu@pengutronix.de>
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
prev parent reply other threads:[~2013-04-24 5:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-17 17:14 Jan Luebbe
2013-04-24 5:56 ` Sascha Hauer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130424055636.GY32299@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=jlu@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox