From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 7 May 2010 01:17:47 +0000 (+0000)
Subject: base-files: add add_dns() and remove_dns() helpers to network config, useful to merge... 
X-Git-Tag: reboot~19926
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=be41fdd01aba63b91c0a644ed33229c5b1f74037;p=openwrt%2Fopenwrt.git

base-files: add add_dns() and remove_dns() helpers to network config, useful to merge dns entries from multiple interfaces

SVN-Revision: 21391
---

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index 4336244f6e..1a77145f5a 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -66,6 +66,35 @@ add_vlan() {
 	return 1
 }
 
+# add dns entries if they are not in resolv.conf yet
+add_dns() {
+	local cfg="$1"; shift
+
+	local dns
+	local add
+	for dns in "$@"; do
+		grep -qsF "nameserver $dns" /tmp/resolv.conf.auto || {
+			add="${add:+$add }$dns"
+			echo "nameserver $dns" >> /tmp/resolv.conf.auto
+		}
+	done
+
+	uci_set_state network "$cfg" dns "$add"
+}
+
+# remove dns entries of the given iface
+remove_dns() {
+	local cfg="$1"
+
+	local dns
+	config_get dns "$cfg" dns
+	for dns in $dns; do
+		sed -i -e "/^nameserver $dns$/d" /tmp/resolv.conf.auto
+	done
+
+	uci_revert_state network "$cfg" dns
+}
+
 # sort the device list, drop duplicates
 sort_list() {
 	local arg="$*"