[packages] vrrpd: use network.sh to find devices

git-svn-id: svn://svn.openwrt.org/openwrt/packages@31967 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/net/vrrpd/Makefile b/net/vrrpd/Makefile
index ad49fda..adc23a4 100644 (file)
--- a/net/vrrpd/Makefile
+++ b/net/vrrpd/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2011 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:=vrrpd
 PKG_VERSION:=1.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/vrrpd

diff --git a/net/vrrpd/files/vrrpd.init b/net/vrrpd/files/vrrpd.init
index 02ce5a3..71e5967 100644 (file)
--- a/net/vrrpd/files/vrrpd.init
+++ b/net/vrrpd/files/vrrpd.init
@@ -1,5 +1,5 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 
 START=50
 
@@ -29,16 +29,6 @@ append_string() {
        [ -n "$_val" ] && append "$var" "$val $_val"
 }
 
-config_get_ifname() {
-       local var="$1"
-       local section="$2"
-       local option="$3"
-       local val="$4"
-       local _val
-       config_get _val "$section" "$option" "$val"
-       config_get "$var" "$_val" 'ifname' "$_val"
-}
-
 section_enabled() {
        local enabled
        config_get_bool enabled "$1" 'enabled' 0
@@ -49,47 +39,49 @@ start_instance() {
        local section="$1"
        local id
        local if
+       local dev
        local args
 
        section_enabled "$section" || return 1
 
        config_get id "$section" 'virtual_id' '1'
-       config_get_ifname if "$section" 'interface' 'lan'
-
-       args="-v $id -i $if"
-       append_string args "$section" 'delay' '-d'
-       append_string args "$section" 'priority' '-p'
-       append_bool args "$section" 'no_virtual_mac' '-n'
-       config_list_foreach "$section" 'virtual_ip' append_list_item args
-
-       SERVICE_PID_FILE="/var/run/vrrpd_${if}_${id}.pid"
-       service_start /usr/sbin/vrrpd $args
+       config_get if "$section" 'interface' 'lan'
+       network_get_device dev "$if" && {
+               args="-v $id -i $dev"
+               append_string args "$section" 'delay' '-d'
+               append_string args "$section" 'priority' '-p'
+               append_bool args "$section" 'no_virtual_mac' '-n'
+               config_list_foreach "$section" 'virtual_ip' append_list_item args
+
+               SERVICE_PID_FILE="/var/run/vrrpd_${dev}_${id}.pid"
+               service_start /usr/sbin/vrrpd $args
+       }
 }
 
 stop_instance() {
        local section="$1"
        local id
        local if
+       local dev
 
        section_enabled "$section" || return 1
 
        config_get id "$section" 'virtual_id' '1'
-       config_get_ifname if "$section" 'interface' 'lan'
+       config_get if "$section" 'interface' 'lan'
+       network_get_device dev "$if"
 
-       SERVICE_PID_FILE="/var/run/vrrpd_${if}_${id}.pid"
+       SERVICE_PID_FILE="/var/run/vrrpd_${dev}_${id}.pid"
        service_stop /usr/sbin/vrrpd
 }
 
 start() {
-       include /lib/network
-       scan_interfaces
+       . /lib/functions/network.sh
        config_load 'vrrpd'
        config_foreach start_instance 'vrrpd'
 }
 
 stop() {
-       include /lib/network
-       scan_interfaces
+       . /lib/functions/network.sh
        config_load 'vrrpd'
        config_foreach stop_instance 'vrrpd'
 }