From 428b3a56a00bcab35f85ca6a4f55939f4561a1cc Mon Sep 17 00:00:00 2001 From: jow Date: Mon, 28 May 2012 15:04:30 +0000 Subject: [PATCH] [packages] yaddns: use network.sh to find device names git-svn-id: svn://svn.openwrt.org/openwrt/packages@31943 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- net/yaddns/Makefile | 4 ++-- net/yaddns/files/etc/hotplug.d/iface/25-ddns | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/net/yaddns/Makefile b/net/yaddns/Makefile index 612d95105..a75685c22 100644 --- a/net/yaddns/Makefile +++ b/net/yaddns/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2010 OpenWrt.org +# Copyright (C) 2006-2012 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=yaddns PKG_VERSION:=1.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://download.gna.org/yaddns/ diff --git a/net/yaddns/files/etc/hotplug.d/iface/25-ddns b/net/yaddns/files/etc/hotplug.d/iface/25-ddns index e06308815..2aefc1881 100644 --- a/net/yaddns/files/etc/hotplug.d/iface/25-ddns +++ b/net/yaddns/files/etc/hotplug.d/iface/25-ddns @@ -5,8 +5,8 @@ YADDNS_PID=/var/run/yaddns.pid prepare_yaddns_conf () { - . /etc/functions.sh - include /lib/network + . /lib/functions.sh + . /lib/functions/network.sh > $YADDNS_CONF @@ -33,9 +33,7 @@ prepare_yaddns_conf () if [ -z "$ip_network" ]; then ip_network="wan" fi - scan_interfaces - config_load /var/state/network - config_get ip_interface $ip_network ifname + network_get_device ip_interface $ip_network fi if [ "$ip_source" = "web" ]; then config_get ip_url $section ip_url