KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

base-files: allow option dns to override dhcp assigned dns servers

Browse source 
SVN-Revision: 14562
This commit is contained in:
Jo-Philipp Wich 2009-02-19 05:27:36 +00:00
parent 38a952aade
commit 2d672ef2f5
2 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/base-files/Makefile
View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=base-files PKG_NAME:=base-files
PKG_RELEASE:=14 PKG_RELEASE:=15
PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/

31
package/base-files/files/usr/share/udhcpc/default.script
View file

@ -14,12 +14,21 @@ hotplug_event() {
config_get proto $ifc proto config_get proto $ifc proto
[ "$proto" = "dhcp" ] || continue [ "$proto" = "dhcp" ] || continue
[ ifup = "$1" ] && { [ 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" ipaddr "$ip"
uci_set_state network "$ifc" netmask "${subnet:-255.255.255.0}" uci_set_state network "$ifc" netmask "${subnet:-255.255.255.0}"
uci_set_state network "$ifc" dnsdomain "$domain" uci_set_state network "$ifc" dnsdomain "$domain"
uci_set_state network "$ifc" dns "$dns" uci_set_state network "$ifc" dns "$dns"
uci_set_state network "$ifc" gateway "$router" uci_set_state network "$ifc" gateway "$router"
} }
env -i ACTION="$1" INTERFACE="$ifc" DEVICE="$ifname" PROTO=dhcp /sbin/hotplug-call iface env -i ACTION="$1" INTERFACE="$ifc" DEVICE="$ifname" PROTO=dhcp /sbin/hotplug-call iface
done done
} }
@ -46,15 +55,8 @@ case "$1" in
$(route -n | awk '/^0.0.0.0\W{9}('$valid')\W/ {next} /^0.0.0.0/ {print "route del -net "$1" gw "$2";"}') $(route -n | awk '/^0.0.0.0\W{9}('$valid')\W/ {next} /^0.0.0.0/ {print "route del -net "$1" gw "$2";"}')
} }
[ -n "$dns" ] && { [ -n "$dns" ] && \
echo -n > "${RESOLV_CONF}.tmp" echo -n > "${RESOLV_CONF}.tmp"
${domain:+echo search $domain} >> "${RESOLV_CONF}.tmp"
for i in $dns ; do
echo "adding dns $i"
echo "nameserver $i" >> "${RESOLV_CONF}.tmp"
done
mv "${RESOLV_CONF}.tmp" "$RESOLV_CONF"
}
if [ "$1" = "renew" ]; then if [ "$1" = "renew" ]; then
hotplug_event update hotplug_event update
@ -62,6 +64,19 @@ case "$1" in
hotplug_event ifup hotplug_event ifup
fi fi
[ -n "$dns" ] && {
[ -s "${RESOLV_CONF}.tmp" ] || {
for i in $dns ; do
echo "adding dns $i"
echo "nameserver $i" >> "${RESOLV_CONF}.tmp"
done
}
${domain:+echo search $domain} >> "${RESOLV_CONF}.tmp"
mv "${RESOLV_CONF}.tmp" "$RESOLV_CONF"
}
# user rules # user rules
[ -f /etc/udhcpc.user ] && . /etc/udhcpc.user [ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
;; ;;