diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-09-13 14:56:05 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-09-13 14:56:05 +0200 |
commit | dd534571bdabeea50e32399b7661b3204275e724 (patch) | |
tree | d1cb34ffde79a411c5054630b505afb4bd4906d4 /defaultenv/defaultenv-1/bin/init | |
parent | ebe2e918c2f8d9afb309f941f516eee3d41e6c3d (diff) | |
parent | faf2ec64e7442fda2e2330c0df047bcd902c5927 (diff) | |
download | barebox-dd534571bdabeea50e32399b7661b3204275e724.tar.gz barebox-dd534571bdabeea50e32399b7661b3204275e724.tar.xz |
Merge branch 'for-next/misc'
Diffstat (limited to 'defaultenv/defaultenv-1/bin/init')
-rw-r--r-- | defaultenv/defaultenv-1/bin/init | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/defaultenv/defaultenv-1/bin/init b/defaultenv/defaultenv-1/bin/init index a55d293f03..2dcddbef2c 100644 --- a/defaultenv/defaultenv-1/bin/init +++ b/defaultenv/defaultenv-1/bin/init @@ -23,9 +23,8 @@ if [ -f /env/bin/init_board ]; then fi echo -e "\e[?25h" -if [ -f /env/bin/boot_board ]; then - . /env/bin/boot_board -elif [ -n $autoboot_timeout ]; then + +if [ -n $autoboot_timeout ]; then echo -n "Hit any key to stop autoboot: " timeout -a $autoboot_timeout if [ $? != 0 ]; then |