From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 17 Jul 2011 23:16:32 +0000 (+0000)
Subject: [packages_10.03.1] merge r27657
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=c77bb8943ca0596fadbdf76942a4fbe4fa6cd4d1;p=openwrt%2Fsvn-archive%2Farchive.git

[packages_10.03.1] merge r27657

SVN-Revision: 27677
---

diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile
index 108627b8a1..c67508bd3b 100644
--- a/net/ddns-scripts/Makefile
+++ b/net/ddns-scripts/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ddns-scripts
 PKG_VERSION:=1.0.0
-PKG_RELEASE:=14
+PKG_RELEASE:=15
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
diff --git a/net/ddns-scripts/files/etc/config/ddns b/net/ddns-scripts/files/etc/config/ddns
index 2545215ed6..db84aaeeab 100644
--- a/net/ddns-scripts/files/etc/config/ddns
+++ b/net/ddns-scripts/files/etc/config/ddns
@@ -62,6 +62,7 @@
 
 config service "myddns"
 	option enabled		"0"
+	option interface	"wan"
 
 	option service_name	"dyndns.org"
 	option domain		"mypersonaldomain.dyndns.org"
diff --git a/net/ddns-scripts/files/etc/hotplug.d/iface/25-ddns b/net/ddns-scripts/files/etc/hotplug.d/iface/25-ddns
index 4b543eb917..4495b5d854 100644
--- a/net/ddns-scripts/files/etc/hotplug.d/iface/25-ddns
+++ b/net/ddns-scripts/files/etc/hotplug.d/iface/25-ddns
@@ -2,9 +2,8 @@
 
 . /usr/lib/ddns/dynamic_dns_functions.sh
 
-if [ "$INTERFACE" = "wan" ] && [ "$ACTION" = "ifup" ]
-then
-	start_daemon_for_all_ddns_sections
+if [ "$ACTION" = "ifup" ]; then
+	start_daemon_for_all_ddns_sections "$INTERFACE"
 fi
 
 
diff --git a/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh b/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh
index 19effeffae..ba18c8b1c4 100644
--- a/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh
+++ b/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh
@@ -110,6 +110,8 @@ verbose_echo()
 
 start_daemon_for_all_ddns_sections()
 {
+	local event_interface="$1"
+
 	SECTIONS=""
 	config_cb() 
 	{
@@ -119,6 +121,9 @@ start_daemon_for_all_ddns_sections()
 
 	for section in $SECTIONS
 	do
+		local iface
+		config_get iface "$section" interface "wan"
+		[ "$iface" = "$event_interface" ] || continue
 		/usr/lib/ddns/dynamic_dns_updater.sh $section 0 > /dev/null 2>&1 &
 	done
 }