base-files: replace udhcpc script with an improved version
SVN-Revision: 15635
This commit is contained in:
Jo-Philipp Wich
parent
4cdb76c219
commit
ca609a2431
1 changed files with 108 additions and 66 deletions
|
|
@ -1,85 +1,127 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
[ -z "$1" ] && echo "Error: should be run by udhcpc" && exit 1
|
[ -z "$1" ] && echo "Error: should be run by udhcpc" && exit 1
|
||||||
|
|
||||||
. /etc/functions.sh
|
. /etc/functions.sh
|
||||||
include /lib/network
|
include /lib/network
|
||||||
|
|
||||||
RESOLV_CONF="/tmp/resolv.conf.auto"
|
RESOLV_CONF="/tmp/resolv.conf.auto"
|
||||||
|
|
||||||
hotplug_event() {
|
change_state () {
|
||||||
scan_interfaces
|
uci_revert_state "$1" "$2" "$3" "$4"
|
||||||
for ifc in $interfaces; do
|
uci_set_state "$1" "$2" "$3" "$4"
|
||||||
config_get ifname $ifc ifname
|
|
||||||
[ "$ifname" = "$interface" ] || continue
|
|
||||||
|
|
||||||
config_get proto $ifc proto
|
|
||||||
[ "$proto" = "dhcp" ] || continue
|
|
||||||
[ ifup = "$1" ] && {
|
|
||||||
config_get userdns "$ifc" dns
|
|
||||||
[ -n "$userdns" ] && {
|
|
||||||
for i in $userdns; do
|
|
||||||
echo "custom dns $i"
|
|
||||||
echo "nameserver $i" >> "${RESOLV_CONF}.tmp"
|
|
||||||
done
|
|
||||||
dns="$userdns"
|
|
||||||
}
|
|
||||||
uci_set_state network "$ifc" ipaddr "$ip"
|
|
||||||
uci_set_state network "$ifc" netmask "${subnet:-255.255.255.0}"
|
|
||||||
uci_set_state network "$ifc" dnsdomain "$domain"
|
|
||||||
uci_set_state network "$ifc" dns "$dns"
|
|
||||||
uci_set_state network "$ifc" gateway "$router"
|
|
||||||
}
|
|
||||||
|
|
||||||
env -i ACTION="$1" INTERFACE="$ifc" DEVICE="$ifname" PROTO=dhcp /sbin/hotplug-call iface
|
|
||||||
done
|
|
||||||
}
|
}
|
||||||
|
|
||||||
case "$1" in
|
uci_get() {
|
||||||
deconfig)
|
uci -P /dev/null get "$1" 2>/dev/null
|
||||||
ifconfig $interface 0.0.0.0
|
}
|
||||||
hotplug_event ifdown
|
|
||||||
;;
|
|
||||||
renew|bound)
|
|
||||||
ifconfig $interface $ip \
|
|
||||||
netmask ${subnet:-255.255.255.0} \
|
|
||||||
broadcast ${broadcast:-+}
|
|
||||||
|
|
||||||
[ -n "$router" ] && {
|
setup_interface () {
|
||||||
for i in $router ; do
|
local old_ip
|
||||||
echo "adding router $i"
|
local old_broadcast
|
||||||
route add default gw $i dev $interface
|
local old_subnet
|
||||||
valid="$valid|$i"
|
local old_router
|
||||||
|
local old_dns
|
||||||
|
local user_dns
|
||||||
|
local user_router
|
||||||
|
|
||||||
done
|
config_get old_ip "$ifc" ipaddr
|
||||||
|
config_get old_broadcast "$ifc" broadcast
|
||||||
|
config_get old_subnet "$ifc" netmask
|
||||||
|
|
||||||
echo "deleting old routes"
|
[ "$ip" != "$old_ip" ] \
|
||||||
$(route -n | awk '/^0.0.0.0\W{9}('$valid')\W/ {next} /^0.0.0.0/ {print "route del -net "$1" gw "$2";"}')
|
|| [ "${broadcast:-+}" != "$old_broadcast" ] \
|
||||||
}
|
|| [ "${subnet:-255.255.255.0}" != "$old_subnet" ] && {
|
||||||
|
echo "udhcpc: ifconfig $interface $ip netmask ${subnet:-255.255.255.0} broadcast ${broadcast:-+}"
|
||||||
|
ifconfig $interface $ip netmask ${subnet:-255.255.255.0} broadcast ${broadcast:-+}
|
||||||
|
|
||||||
[ -n "$dns" ] && \
|
change_state network "$ifc" ipaddr "$ip"
|
||||||
echo -n > "${RESOLV_CONF}.tmp"
|
change_state network "$ifc" broadcast "${broadcast:-+}"
|
||||||
|
change_state network "$ifc" netmask "${subnet:-255.255.255.0}"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# Default Route
|
||||||
|
change_state network "$ifc" lease_gateway "$router"
|
||||||
|
config_get old_router "$ifc" gateway
|
||||||
|
user_router=$(uci_get "network.$ifc.gateway")
|
||||||
|
[ -n "$user_router" ] && router="$user_router"
|
||||||
|
|
||||||
|
[ -n "$router" ] && [ "$router" != "0.0.0.0" ] && [ "$router" != "$old_router" ] && {
|
||||||
|
echo "udhcpc: setting default routers: $router"
|
||||||
|
|
||||||
|
local valid_gw=""
|
||||||
|
for i in $router ; do
|
||||||
|
route add default gw $i dev $interface
|
||||||
|
valid_gw="${valid_gw:+$valid_gw|}$i"
|
||||||
|
done
|
||||||
|
|
||||||
[ -n "$dns" ] && {
|
eval $(route -n | awk '
|
||||||
[ -s "${RESOLV_CONF}.tmp" ] || {
|
/^0.0.0.0\W{9}('$valid_gw')\W/ {next}
|
||||||
for i in $dns ; do
|
/^0.0.0.0/ {print "route del -net "$1" gw "$2";"}
|
||||||
echo "adding dns $i"
|
')
|
||||||
echo "nameserver $i" >> "${RESOLV_CONF}.tmp"
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
${domain:+echo search $domain} >> "${RESOLV_CONF}.tmp"
|
change_state network "$ifc" gateway "$router"
|
||||||
|
}
|
||||||
|
|
||||||
mv "${RESOLV_CONF}.tmp" "$RESOLV_CONF"
|
|
||||||
}
|
|
||||||
|
|
||||||
if [ "$1" = "renew" ]; then
|
# DNS
|
||||||
hotplug_event update
|
config_get old_dns "$ifc" dns
|
||||||
else
|
user_dns=$(uci_get "network.$ifc.dns")
|
||||||
hotplug_event ifup
|
[ -n "$user_dns" ] && dns="$user_dns"
|
||||||
fi
|
|
||||||
|
|
||||||
# user rules
|
[ -n "$dns" ] && [ "$dns" != "$old_dns" ] && {
|
||||||
[ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
|
echo "udhcpc: setting dns servers: $dns"
|
||||||
;;
|
echo -n > "${RESOLV_CONF}.tmp"
|
||||||
esac
|
for i in $dns ; do
|
||||||
|
echo "nameserver $i" >> "${RESOLV_CONF}.tmp"
|
||||||
|
done
|
||||||
|
${domain:+echo search $domain} >> "${RESOLV_CONF}.tmp"
|
||||||
|
mv "${RESOLV_CONF}.tmp" "$RESOLV_CONF"
|
||||||
|
|
||||||
|
change_state network "$ifc" dnsdomain "$domain"
|
||||||
|
change_state network "$ifc" dns "$dns"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# UCI State
|
||||||
|
change_state network "$ifc" lease_server "$serverid"
|
||||||
|
change_state network "$ifc" lease_acquired "$(date '+%s')"
|
||||||
|
change_state network "$ifc" lease_lifetime "$lease"
|
||||||
|
[ -n "$ntpsrv" ] && change_state network "$ifc" lease_ntpsrv "$ntpsrv"
|
||||||
|
[ -n "$timesvr" ] && change_state network "$ifc" lease_timesrv "$timesvr"
|
||||||
|
[ -n "$hostname" ] && change_state network "$ifc" lease_hostname "$hostname"
|
||||||
|
[ -n "$timezone" ] && change_state network "$ifc" lease_timezone "$timezone"
|
||||||
|
|
||||||
|
|
||||||
|
# Hotplug
|
||||||
|
env -i ACTION="$1" INTERFACE="$ifc" DEVICE="$ifname" PROTO=dhcp /sbin/hotplug-call iface
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
scan_interfaces
|
||||||
|
|
||||||
|
for ifc in $interfaces; do
|
||||||
|
config_get ifname "$ifc" ifname
|
||||||
|
[ "$ifname" = "$interface" ] || continue
|
||||||
|
|
||||||
|
config_get proto "$ifc" proto
|
||||||
|
[ "$proto" = "dhcp" ] || continue
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
deconfig)
|
||||||
|
ifconfig "$interface" 0.0.0.0
|
||||||
|
env -i ACTION="ifdown" INTERFACE="$ifc" DEVICE="$ifname" PROTO=dhcp /sbin/hotplug-call iface
|
||||||
|
uci_revert_state network "$ifc"
|
||||||
|
;;
|
||||||
|
renew)
|
||||||
|
setup_interface update
|
||||||
|
;;
|
||||||
|
bound)
|
||||||
|
setup_interface ifup
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# user rules
|
||||||
|
[ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
|
||||||
|
done
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue