diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2013-06-26 14:29:19 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-06-26 14:34:25 +0200 |
| commit | 8432d81a849efca1d95ab0bd1324afd96bbdd804 (patch) | |
| tree | 7ff4065462dae9b1b6e3e506a0fd5a06860f1bd7 /package/busybox | |
| parent | 0c229f70ea270069e981bfb59e3aea80b21bbcfb (diff) | |
| download | buildroot-novena-8432d81a849efca1d95ab0bd1324afd96bbdd804.tar.gz buildroot-novena-8432d81a849efca1d95ab0bd1324afd96bbdd804.zip | |
busybox: udhcpc.script: cleanup
ifconfig up is a no-op if the device is already running, so let's just
do that unconditionally.
Systems might have multiple network devices, and perhaps run udhcpc on
another interface even when booted over nfs, so don't disable the
per-interface deconfig based on the global nfsroot= setting on the kernel
command line.
If you don't want udhcpc to mess with kernel level IP autoconfiguration
(E.G. for nfs boot), you should instead ensure udhcpc/ifup/ifplugd isn't
started for that interface.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/busybox')
| -rwxr-xr-x | package/busybox/udhcpc.script | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/package/busybox/udhcpc.script b/package/busybox/udhcpc.script index 0bb3dea03..f7beb56a0 100755 --- a/package/busybox/udhcpc.script +++ b/package/busybox/udhcpc.script @@ -10,14 +10,9 @@ RESOLV_CONF="/etc/resolv.conf" case "$1" in deconfig) - grep -q -v ip= /proc/cmdline - if [ $? -eq 0 ]; then - /sbin/ifconfig $interface up - fi - grep -q -v nfsroot= /proc/cmdline - if [ $? -eq 0 ]; then - /sbin/ifconfig $interface 0.0.0.0 - fi + /sbin/ifconfig $interface up + /sbin/ifconfig $interface 0.0.0.0 + if [ -x /usr/sbin/avahi-autoipd ]; then /usr/sbin/avahi-autoipd -k $interface fi |