From: Sascha Hauer <sha@pengutronix.de>
To: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/7] defaultenv: simplify scripting
Date: Fri, 8 Apr 2011 12:42:58 +0200 [thread overview]
Message-ID: <20110408104258.GV7285@pengutronix.de> (raw)
In-Reply-To: <1302257948-18174-2-git-send-email-mkl@pengutronix.de>
On Fri, Apr 08, 2011 at 12:19:02PM +0200, Marc Kleine-Budde wrote:
> Signed-off-by: Marc Kleine-Budde <mkl@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@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 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2011-04-08 10:43 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-08 10:19 [PATCH 0/7] defaultenv updates Marc Kleine-Budde
2011-04-08 10:19 ` [PATCH 1/7] defaultenv: simplify scripting Marc Kleine-Budde
2011-04-08 10:42 ` Sascha Hauer [this message]
2011-04-08 10:49 ` Marc Kleine-Budde
2011-04-08 10:19 ` [PATCH 2/7] defaultenv: boot: add backwards compatibility for kernel_loc=net Marc Kleine-Budde
2011-04-08 13:32 ` Jean-Christophe PLAGNIOL-VILLARD
2011-04-08 13:59 ` Marc Kleine-Budde
2011-04-08 10:19 ` [PATCH 3/7] defaultenv: boot: add eth0 to ip configuration Marc Kleine-Budde
2011-04-08 10:19 ` [PATCH 4/7] defaultenv: boot: add serverip to static " Marc Kleine-Budde
2011-04-08 10:19 ` [PATCH 5/7] defaultenv: boot: add support to boot from disk Marc Kleine-Budde
2011-04-08 13:38 ` Jean-Christophe PLAGNIOL-VILLARD
2011-04-08 10:19 ` [PATCH 6/7] defaultenv: update: add support to update kernel on disk Marc Kleine-Budde
2011-04-08 10:19 ` [PATCH 7/7] defaultenv: add config template Marc Kleine-Budde
2011-04-08 13:41 ` Jean-Christophe PLAGNIOL-VILLARD
2011-04-08 13:59 ` Marc Kleine-Budde
2011-04-08 10:26 ` [PATCH 0/7] defaultenv updates Marc Kleine-Budde
2011-04-08 11:08 ` [PATCH 1/7 v2] defaultenv: simplify scripting Marc Kleine-Budde
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110408104258.GV7285@pengutronix.de \
--to=sha@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=mkl@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox