[PATCH 1/1] defaultenv-2: execute init/* before timeout

[Sascha Hauer]

On Wed, Sep 19, 2012 at 11:50:35AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> so we can have splah, usb serial, etc...
> 
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
> ---
>  defaultenv-2/base/bin/init |    8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/defaultenv-2/base/bin/init b/defaultenv-2/base/bin/init
> index 3cac41c..5524710 100644
> --- a/defaultenv-2/base/bin/init
> +++ b/defaultenv-2/base/bin/init
> @@ -12,7 +12,9 @@ global linux.bootargs.dyn.ip
>  global linux.bootargs.dyn.root
>  global editcmd=sedit
>  
> -/env/init/general
> +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: "
> @@ -27,10 +29,6 @@ if [ "${key}" = "q" ]; then
>  	exit
>  fi
>  
> -for i in /env/init/*; do
> -	. $i
> -done
> -

This was intentionally done *after* waiting for user intervention to be
able to escape in case some init script crashes barebox.

Sascha


-- 
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 |