diff options
| author | Jan Luebbe <jlu@pengutronix.de> | 2013-04-17 19:14:12 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-24 07:56:25 +0200 |
| commit | a9634ce95b92b052a00912f4d2e5330f04997784 (patch) | |
| tree | b143729e48b53d3b473d461a9fe97e205043314d /defaultenv-2 | |
| parent | 07c62e1060ea411afa48cfc38bb9c9d48a17ce9b (diff) | |
| download | barebox-a9634ce95b92b052a00912f4d2e5330f04997784.tar.gz barebox-a9634ce95b92b052a00912f4d2e5330f04997784.tar.xz | |
defaultenv-2: init: display prompt after running /env/init/*
This allows init scripts to print messages to the console without messing
up the timeout prompt.
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'defaultenv-2')
| -rw-r--r-- | defaultenv-2/base/bin/init | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/defaultenv-2/base/bin/init b/defaultenv-2/base/bin/init index 6a658d137c..ca02ba6427 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="$?" |