[PATCH 1/7] defaultenv: simplify scripting

[Sascha Hauer]

On Fri, Apr 08, 2011 at 12:19:02PM +0200, Marc Kleine-Budde wrote:
> Signed-off-by: Marc Kleine-Budde <mkl at pengutronix.de>
> ---
>  defaultenv/bin/boot   |    2 +-
>  defaultenv/bin/update |    8 ++++----
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot
> index de4fa24..c97a396 100644
> --- a/defaultenv/bin/boot
> +++ b/defaultenv/bin/boot
> @@ -74,7 +74,7 @@ if [ ! -e /dev/ram0.kernel ]; then
>  	addpart /dev/ram0 8M at 8M(kernel)
>  fi
>  
> -if [ x$kernel_loc = xnfs ] || [ x$kernel_loc = xtftp ]; then
> +if [ x$kernel_loc = xnfs -o x$kernel_loc = xtftp ]; then
>  	if [ x$ip = xdhcp ]; then
>  		dhcp
>  	fi
> diff --git a/defaultenv/bin/update b/defaultenv/bin/update
> index 7c37c36..c78159d 100644
> --- a/defaultenv/bin/update
> +++ b/defaultenv/bin/update
> @@ -32,12 +32,12 @@ elif [ x${type} = xrootfs ]; then
>  	type=root
>  elif [ x${type} = xbarebox ]; then
>  	image=$bareboximage
> -	if [ x${image} = x ]; then
> +	if [ -z x${image} ]; then

s/x${image}/${image}/

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 |