mirror of
https://git.yoctoproject.org/poky
synced 2026-02-11 11:13:04 +01:00
e223f7cbb1
The udhcpc script fails to properly set a default route when: - 'ip' is present ($have_bin_ip -eq 1) - there are 2 or more interfaces connected to the same network (e.g. ethernet + wifi on the same home LAN / same DHCP server) In this case, when the first interface gets an address from DHCP (e.g. eth0), a default route is set correctly. When the second interface (e.g. wlan0) gets its address, 'ip route add' without 'dev $interface' sets the route on the other interface. The result looks like: # ip route default via 192.168.1.1 dev eth0 metric 5 default via 192.168.1.1 dev eth0 metric 10 # wrong dev here 192.168.1.0/24 dev eth0 scope link src 192.168.1.20 192.168.1.0/24 dev wlan0 scope link src 192.168.1.30 # The situation might go unnoticed until eth0 is disconnected, because only wlan0 is present but there is no route through wlan0. Fix by explicitly passing "dev $interface" to 'ip route add'. Note that all other 'ip' invocations already have "dev $interface" passed. (From OE-Core rev: bb526eee429f25b85372f41e4d6d2865bcc39173) Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
89 lines
2.6 KiB
Bash
89 lines
2.6 KiB
Bash
#!/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 "$subnet" ] && NETMASK="netmask $subnet"
|
|
|
|
# return 0 if root is mounted on a network filesystem
|
|
root_is_nfs() {
|
|
sed -n 's/^[^ ]* \([^ ]*\) \([^ ]*\) .*$/\1 \2/p' /proc/mounts |
|
|
grep -q "^/ \(nfs\|smbfs\|ncp\|coda\)$"
|
|
}
|
|
|
|
have_bin_ip=0
|
|
if [ -x /SBIN_DIR/ip ]; then
|
|
have_bin_ip=1
|
|
BROADCAST="broadcast +"
|
|
fi
|
|
|
|
[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
|
|
|
|
case "$1" in
|
|
deconfig)
|
|
if [ -x /SBIN_DIR/resolvconf ]; then
|
|
/SBIN_DIR/resolvconf -d "${interface}.udhcpc"
|
|
fi
|
|
if ! root_is_nfs ; then
|
|
if [ $have_bin_ip -eq 1 ]; then
|
|
/SBIN_DIR/ip -4 addr flush dev $interface
|
|
/SBIN_DIR/ip link set dev $interface up
|
|
else
|
|
/SBIN_DIR/ifconfig $interface 0.0.0.0
|
|
fi
|
|
fi
|
|
;;
|
|
|
|
renew|bound)
|
|
if [ $have_bin_ip -eq 1 ]; then
|
|
/SBIN_DIR/ip addr add dev $interface local $ip/$mask $BROADCAST
|
|
else
|
|
/SBIN_DIR/ifconfig $interface $ip $BROADCAST $NETMASK
|
|
fi
|
|
|
|
if [ -n "$router" ] ; then
|
|
if ! root_is_nfs ; then
|
|
if [ $have_bin_ip -eq 1 ]; then
|
|
while /SBIN_DIR/ip route del default dev $interface 2>/dev/null ; do
|
|
:
|
|
done
|
|
else
|
|
while /SBIN_DIR/route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do
|
|
:
|
|
done
|
|
fi
|
|
fi
|
|
|
|
metric=10
|
|
for i in $router ; do
|
|
if [ $have_bin_ip -eq 1 ]; then
|
|
/SBIN_DIR/ip route add default via $i metric $metric dev $interface
|
|
else
|
|
/SBIN_DIR/route add default gw $i dev $interface metric $metric 2>/dev/null
|
|
fi
|
|
metric=$(($metric + 1))
|
|
done
|
|
fi
|
|
|
|
# Update resolver configuration file
|
|
R=""
|
|
[ -n "$domain" ] && R="domain $domain
|
|
"
|
|
for i in $dns; do
|
|
echo "$0: Adding DNS $i"
|
|
R="${R}nameserver $i
|
|
"
|
|
done
|
|
|
|
if [ -x /SBIN_DIR/resolvconf ]; then
|
|
echo -n "$R" | /SBIN_DIR/resolvconf -a "${interface}.udhcpc"
|
|
else
|
|
echo -n "$R" > "$RESOLV_CONF"
|
|
fi
|
|
;;
|
|
esac
|
|
|
|
exit 0
|