summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2011-02-02 23:09:18 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-02-03 09:56:47 +0100
commit86ddd55dda013516e633cafca956ca81ec673e9b (patch)
treeba826b981b96fc2d3b4c8d80f7078e73626940f4
parentb49e601449d52fb10d8816b5d23644332111d002 (diff)
downloadbarebox-86ddd55dda013516e633cafca956ca81ec673e9b.tar.gz
barebox-86ddd55dda013516e633cafca956ca81ec673e9b.tar.xz
defaultenv/bin/boot: fix ubi root's name assignment
This patch fixes a regression introduced in commit d15cfafeef8f99ff1a47e77362d0adf1b07f26ae. While there, use "-z" to check if ubiroot variable is empty. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Acked-By: Eric Bénard<eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--defaultenv/bin/boot4
1 files changed, 2 insertions, 2 deletions
diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot
index fa6874827b..788a781159 100644
--- a/defaultenv/bin/boot
+++ b/defaultenv/bin/boot
@@ -34,8 +34,8 @@ else
fi
if [ x$rootfs_type = xubifs ]; then
- if [ x$ubiroot = x ]; then
- ubiroot = "root"
+ if [ -z $ubiroot ]; then
+ ubiroot="root"
fi
bootargs="$bootargs root=ubi0:$ubiroot ubi.mtd=$rootfs_mtdblock"
else