diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-11 09:08:49 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-11 09:08:49 +0200 |
| commit | fdc889de61fb67dcecadf850fb1f534c786668e9 (patch) | |
| tree | 4f4015accd8dcc83351f45f8489587b38f53e709 /defaultenv | |
| parent | 7541ec644df5ecaf890c8be74fbff59581717aa1 (diff) | |
| parent | 32e630d182a5479e5da60906523b74a19cf5caab (diff) | |
| download | barebox-fdc889de61fb67dcecadf850fb1f534c786668e9.tar.gz barebox-fdc889de61fb67dcecadf850fb1f534c786668e9.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'defaultenv')
| -rw-r--r-- | defaultenv/bin/_update | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/defaultenv/bin/_update b/defaultenv/bin/_update index e7cf1496e9..8e27ee10c6 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 |