584f418ec1
When udhcpc is used on multiple network devices at the same time (or a mix of dhcp and fixed configuration), /etc/resolv.conf should contain the union of information from all the interfaces. Currently that's not the case. The udhcpc script simply overwrites resolv.conf with the information from the specific interface on each dhcp bound/renew event. Fix it by tagging lines with the interface they came from when added, and drop the affected lines on deconfig/renew. As /etc/resolv.conf is often a symlink to /tmp (and rootfs might be read only), special care has to be taken when it is updated. Notice that I'm not really aware of any official documentation requiring that '#' comments in /etc/resolv.conf must be supported, but atleast glibc and uClibc do. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
67 lines
1.5 KiB
Bash
Executable File
67 lines
1.5 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
# udhcpc script edited by Tim Riker <Tim@Rikers.org>
|
|
|
|
[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
|
|
|
|
RESOLV_CONF="/etc/resolv.conf"
|
|
[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
|
|
[ -n "$subnet" ] && NETMASK="netmask $subnet"
|
|
|
|
case "$1" in
|
|
deconfig)
|
|
/sbin/ifconfig $interface up
|
|
/sbin/ifconfig $interface 0.0.0.0
|
|
|
|
# drop info from this interface
|
|
# resolv.conf may be a symlink to /tmp/, so take care
|
|
TMPFILE=$(mktemp)
|
|
grep -vE "# $interface\$" $RESOLV_CONF > $TMPFILE
|
|
cat $TMPFILE > $RESOLV_CONF
|
|
rm -f $TMPFILE
|
|
|
|
if [ -x /usr/sbin/avahi-autoipd ]; then
|
|
/usr/sbin/avahi-autoipd -k $interface
|
|
fi
|
|
;;
|
|
|
|
leasefail|nak)
|
|
if [ -x /usr/sbin/avahi-autoipd ]; then
|
|
/usr/sbin/avahi-autoipd -wD $interface --no-chroot
|
|
fi
|
|
;;
|
|
|
|
renew|bound)
|
|
if [ -x /usr/sbin/avahi-autoipd ]; then
|
|
/usr/sbin/avahi-autoipd -k $interface
|
|
fi
|
|
/sbin/ifconfig $interface $ip $BROADCAST $NETMASK
|
|
|
|
if [ -n "$router" ] ; then
|
|
echo "deleting routers"
|
|
while route del default gw 0.0.0.0 dev $interface ; do
|
|
:
|
|
done
|
|
|
|
for i in $router ; do
|
|
route add default gw $i dev $interface
|
|
done
|
|
fi
|
|
|
|
# drop info from this interface
|
|
# resolv.conf may be a symlink to /tmp/, so take care
|
|
TMPFILE=$(mktemp)
|
|
grep -vE "# $interface\$" $RESOLV_CONF > $TMPFILE
|
|
cat $TMPFILE > $RESOLV_CONF
|
|
rm -f $TMPFILE
|
|
|
|
[ -n "$domain" ] && echo "search $domain # $interface" >> $RESOLV_CONF
|
|
for i in $dns ; do
|
|
echo adding dns $i
|
|
echo "nameserver $i # $interface" >> $RESOLV_CONF
|
|
done
|
|
;;
|
|
esac
|
|
|
|
exit 0
|