summaryrefslogtreecommitdiffstats
path: root/defaultenv
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-04-11 09:08:49 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-04-11 09:08:49 +0200
commitfdc889de61fb67dcecadf850fb1f534c786668e9 (patch)
tree4f4015accd8dcc83351f45f8489587b38f53e709 /defaultenv
parent7541ec644df5ecaf890c8be74fbff59581717aa1 (diff)
parent32e630d182a5479e5da60906523b74a19cf5caab (diff)
downloadbarebox-fdc889de61fb67dcecadf850fb1f534c786668e9.tar.gz
Merge branch 'master' into next
Diffstat (limited to 'defaultenv')
-rw-r--r--defaultenv/bin/_update2
1 files changed, 1 insertions, 1 deletions
diff --git a/defaultenv/bin/_update b/defaultenv/bin/_update
index e7cf149..8e27ee1 100644
--- a/defaultenv/bin/_update
+++ b/defaultenv/bin/_update
@@ -11,7 +11,7 @@ if [ ! -e "$part" ]; then
fi
if [ x$mode = xtftp -o x$mode = xnfs ]; then
- if [ x$ip = xdhcp ]; then
+ if [ x$ip = xdhcp -o x$ip = "xdhcp-barebox" ]; then
dhcp
fi