[PATCH 11/13] defaultenv: use /env/oftree if it exists

Jean-Christophe PLAGNIOL-VILLARD plagnioj at jcrosoft.com
Mon Aug 20 11:00:09 EDT 2012


On 16:20 Mon 20 Aug     , Jan Luebbe wrote:
> Signed-off-by: Jan Luebbe <jlu at pengutronix.de>
> ---
>  defaultenv/bin/boot |    6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot
> index cc72af5..bf6ec76 100644
> --- a/defaultenv/bin/boot
> +++ b/defaultenv/bin/boot
> @@ -135,8 +135,10 @@ else
>  	exit 1
>  fi
>  
> -if [ x$oftree_loc = xnfs -o x$oftree_loc = xtftp ]; then
> -	odev=/oftree
> +if [ -e /env/oftree ]; then
> +	odev="/env/oftree"
and here this need to be the last one anyway
> +elif [ x$oftree_loc = xnfs -o x$oftree_loc = xtftp ]; then
> +	odev="/oftree"
>  	$oftree_loc $oftreeimage $odev || exit 1
>  elif [ x$oftree_loc = xnor ]; then
>  	odev="/dev/nor0.oftree"
please use defaultenv-2

Best Regards,
J.



More information about the barebox mailing list