From 7e7620331b0282ef5962972fff4b46b02faa7223 Mon Sep 17 00:00:00 2001 From: jow Date: Sun, 17 Jul 2011 17:56:04 +0000 Subject: [PATCH] [packages] ddns-scripts: add an option to specify the used interface - default to wan to retain compatibility (#7570) git-svn-id: svn://svn.openwrt.org/openwrt/packages@27657 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- net/ddns-scripts/Makefile | 2 +- net/ddns-scripts/files/etc/config/ddns | 1 + net/ddns-scripts/files/etc/hotplug.d/iface/25-ddns | 5 ++--- net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index 108627b8a..c67508bd3 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 2545215ed..db84aaeea 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 4b543eb91..4495b5d85 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 19effeffa..ba18c8b1c 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 }