summaryrefslogtreecommitdiffstats
path: root/defaultenv
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2010-10-21 14:55:54 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-10-21 14:56:16 +0200
commit94e30f2ee3d5506f38178932f4a0c4cae1f037f1 (patch)
tree17a988f783357e3fade9a7be8723e641c38bc046 /defaultenv
parente9ff34657a9aeb42bd76141e97b0fb047ebfde58 (diff)
downloadbarebox-94e30f2ee3d5506f38178932f4a0c4cae1f037f1.tar.gz
barebox-94e30f2ee3d5506f38178932f4a0c4cae1f037f1.tar.xz
defaultenv: do not overwrite bootargs variable
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'defaultenv')
-rw-r--r--defaultenv/bin/boot2
1 files changed, 1 insertions, 1 deletions
diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot
index 6476bdb4d..3fdc5c186 100644
--- a/defaultenv/bin/boot
+++ b/defaultenv/bin/boot
@@ -16,7 +16,7 @@ fi
if [ x$ip = xdhcp ]; then
bootargs="$bootargs ip=dhcp"
elif [ x$ip = xnone ]; then
- bootargs="ip=none"
+ bootargs="$bootargs ip=none"
else
bootargs="$bootargs ip=$eth0.ipaddr::$eth0.gateway:$eth0.netmask:::"
fi