From b69eb26300b29fc55320f72400491f5fceb870a9 Mon Sep 17 00:00:00 2001 From: jow Date: Mon, 28 May 2012 15:38:58 +0000 Subject: [PATCH] [packages] parprouted: use network.sh to find devices git-svn-id: svn://svn.openwrt.org/openwrt/packages@31949 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- net/parprouted/Makefile | 4 ++-- net/parprouted/files/parprouted.init | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/net/parprouted/Makefile b/net/parprouted/Makefile index db5374765..6ada5db17 100644 --- a/net/parprouted/Makefile +++ b/net/parprouted/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:=parprouted PKG_VERSION:=0.64 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.hazard.maks.net/parprouted/ diff --git a/net/parprouted/files/parprouted.init b/net/parprouted/files/parprouted.init index 137983c3c..7c5a90de7 100644 --- a/net/parprouted/files/parprouted.init +++ b/net/parprouted/files/parprouted.init @@ -1,5 +1,5 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2012 OpenWrt.org START=50 @@ -11,9 +11,9 @@ section_enabled() { append_interface() { local name="$1" - local interface - config_get interface "$name" 'ifname' "$name" - append args "$interface" + local device + network_get_device device "$name" + append args "${device:-$name}" } start_instance() { @@ -33,8 +33,8 @@ start_instance() { } start() { - include /lib/network - scan_interfaces + . /lib/network/functions.sh + config_load 'parprouted' config_foreach start_instance 'parprouted' }