diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-31 12:00:53 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-06-30 12:45:46 +0200 |
| commit | 2ac974b5414efb1ea594f31b274bd14e79aa73f4 (patch) | |
| tree | 9865e93f5eed4e8511504b6dd1f7810f1ce78501 | |
| parent | a6e358b2f5b219fda18a7bc9348cb969043c19d5 (diff) | |
| download | barebox-2ac974b5414efb1ea594f31b274bd14e79aa73f4.tar.gz barebox-2ac974b5414efb1ea594f31b274bd14e79aa73f4.tar.xz | |
defaultenv-2 ifup: Always overwrite eth0.serverip
if serverip is specified, also overwrite eth0.serverip in dhcp
case. This makes it possible to specify a different serverip
when the dhcp server returns the wrong ip (because the DHCP
might be a DSL router which does not provide tftp).
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | defaultenv-2/base/bin/ifup | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/defaultenv-2/base/bin/ifup b/defaultenv-2/base/bin/ifup index 9f6fd6bc49..ed33b06672 100644 --- a/defaultenv-2/base/bin/ifup +++ b/defaultenv-2/base/bin/ifup @@ -53,7 +53,12 @@ if [ "$ip" = static ]; then ${interface}.gateway=$gateway elif [ "$ip" = dhcp ]; then dhcp - exit $? + ret=$? + if [ $ret = 0 -a -n "$serverip" ]; then + ${interface}.serverip=$serverip + fi + + exit $ret fi echo -o /tmp/network/$interface up |