From 8432d81a849efca1d95ab0bd1324afd96bbdd804 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 26 Jun 2013 14:29:19 +0200 Subject: [PATCH] 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 --- package/busybox/udhcpc.script | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/package/busybox/udhcpc.script b/package/busybox/udhcpc.script index 0bb3dea03c..f7beb56a08 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 -- 2.30.2