From 4d52d8b65322e77be1021c41f42639f557869753 Mon Sep 17 00:00:00 2001 From: jow Date: Mon, 6 May 2013 10:01:45 +0000 Subject: ipset-dns: support simultaneously populating IPv4 and IPv6 sets git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36554 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/network/services/ipset-dns/files/ipset-dns.init | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'package/network/services/ipset-dns/files/ipset-dns.init') diff --git a/package/network/services/ipset-dns/files/ipset-dns.init b/package/network/services/ipset-dns/files/ipset-dns.init index 5d41539a7..7b732791e 100755 --- a/package/network/services/ipset-dns/files/ipset-dns.init +++ b/package/network/services/ipset-dns/files/ipset-dns.init @@ -21,10 +21,11 @@ find_nameserver() { start_instance() { local cfg="$1" - local ipset port dns + local ipset ipset6 port dns config_get ipset "$cfg" ipset - [ -n "$ipset" ] || { + config_get ipset6 "$cfg" ipset6 + [ -n "$ipset$ipset6" ] || { echo "No ipset specified for instance $cfg" >&2 return 1 } @@ -38,7 +39,7 @@ start_instance() { config_get port "$cfg" port $((PORT++)) SERVICE_PID_FILE="/var/run/ipset-dns-$port.pid" \ - service_start /usr/sbin/ipset-dns "$ipset" "$port" "$dns" + service_start /usr/sbin/ipset-dns "$ipset" "$ipset6" "$port" "$dns" } start() { -- cgit v1.2.3