summaryrefslogtreecommitdiffstats
path: root/defaultenv/bin/boot
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2011-09-25 22:54:04 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2011-09-26 13:22:24 +0200
commit4ac5def38adb65e392f0b7b3965c6763e8ae3fa4 (patch)
treed4a5e6cb712698cade486bb792995878dc5a1910 /defaultenv/bin/boot
parent5cd360c2952e9164e415a1058676367cd4f109a5 (diff)
downloadbarebox-4ac5def38adb65e392f0b7b3965c6763e8ae3fa4.tar.gz
barebox-4ac5def38adb65e392f0b7b3965c6763e8ae3fa4.tar.xz
defaultenv: simplify scripting
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'defaultenv/bin/boot')
-rw-r--r--defaultenv/bin/boot2
1 files changed, 1 insertions, 1 deletions
diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot
index de4fa24f27..c97a3969c7 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