From: Wolfram Sang <w.sang@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 01/11] defaultenv: simplify scripting
Date: Sun, 25 Sep 2011 22:54:04 +0200 [thread overview]
Message-ID: <1316984054-31295-2-git-send-email-w.sang@pengutronix.de> (raw)
In-Reply-To: <1316984054-31295-1-git-send-email-w.sang@pengutronix.de>
From: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Wolfram Sang <w.sang@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 55ac10b..6fd5e4c 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 ${image} ]; then
image=barebox.bin
fi
elif [ x${type} = xbareboxenv ]; then
image=$bareboxenvimage
- if [ x${image} = x ]; then
+ if [ -z ${image} ]; then
image=bareboxenv.bin
fi
elif [ x${type} = xxload ]; then
@@ -47,7 +47,7 @@ else
exit 1
fi
-if [ x${imagename} != x ]; then
+if [ -n ${imagename} ]; then
image=${imagename}
fi
@@ -60,7 +60,7 @@ else
exit 1
fi
-if [ x${mode} != xtftp ] && [ x${mode} != xxmodem ] ; then
+if [ x${mode} != xtftp -a x${mode} != xxmodem ] ; then
echo "unsupported mode ${mode}."
. /env/bin/_update_help
exit 1
--
1.7.5.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2011-09-25 20:54 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-25 20:54 [PATCH 00/11] improvements for net & disk booting Wolfram Sang
2011-09-25 20:54 ` Wolfram Sang [this message]
2011-09-25 20:54 ` [PATCH 02/11] defaultenv: boot: add backwards compatibility for kernel_loc=net Wolfram Sang
2011-09-25 20:54 ` [PATCH 03/11] defaultenv: boot: add eth0 to ip configuration Wolfram Sang
2011-09-25 20:54 ` [PATCH 04/11] defaultenv: boot: add serverip to static " Wolfram Sang
2011-09-25 20:54 ` [PATCH 05/11] defaultenv: boot: add support to boot from disk Wolfram Sang
2011-09-25 20:54 ` [PATCH 06/11] defaultenv: update: add support to update kernel on disk Wolfram Sang
2011-09-25 20:54 ` [PATCH 07/11] defaultenv: add config template Wolfram Sang
2011-09-25 20:54 ` [PATCH 08/11] net: string_to_ip: add sanity check for > 255 Wolfram Sang
2011-09-25 20:54 ` [PATCH 09/11] net: getenv_ip: check return value of string_to_ip Wolfram Sang
2011-09-25 20:54 ` [PATCH 10/11] defaultenv: place eth0.ethaddr more visibly Wolfram Sang
2011-09-25 20:54 ` [PATCH 11/11] net: dhcp: introduce global serverip variable Wolfram Sang
2011-09-26 9:57 ` Sascha Hauer
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=1316984054-31295-2-git-send-email-w.sang@pengutronix.de \
--to=w.sang@pengutronix.de \
--cc=barebox@lists.infradead.org \
/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