aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2009-02-19 05:27:36 +0000
committerJo-Philipp Wich <jow@openwrt.org>2009-02-19 05:27:36 +0000
commita811c29ce98326b9ef9505bd9a8be37b4e48b787 (patch)
treea47e9a2f1e8f30591af3cffae97fc0b6144a1290
parentd540993087ce5d014ed229bba8cb682c0db3b640 (diff)
downloadmaster-187ad058-a811c29ce98326b9ef9505bd9a8be37b4e48b787.tar.gz
master-187ad058-a811c29ce98326b9ef9505bd9a8be37b4e48b787.tar.bz2
master-187ad058-a811c29ce98326b9ef9505bd9a8be37b4e48b787.zip
[package] base-files: allow option dns to override dhcp assigned dns servers
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14562 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/base-files/Makefile2
-rwxr-xr-xpackage/base-files/files/usr/share/udhcpc/default.script33
2 files changed, 25 insertions, 10 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 41dc310678..437952d72f 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=base-files
-PKG_RELEASE:=14
+PKG_RELEASE:=15
PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
diff --git a/package/base-files/files/usr/share/udhcpc/default.script b/package/base-files/files/usr/share/udhcpc/default.script
index 0eb044c512..198ef13c0f 100755
--- a/package/base-files/files/usr/share/udhcpc/default.script
+++ b/package/base-files/files/usr/share/udhcpc/default.script
@@ -14,12 +14,21 @@ hotplug_event() {
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
}
@@ -45,16 +54,9 @@ case "$1" in
echo "deleting old routes"
$(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"
- ${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
hotplug_event update
@@ -62,6 +64,19 @@ case "$1" in
hotplug_event ifup
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
[ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
;;