From 475dc21e59a192798c51542c208f0a4af5cedfd0 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 29 May 2012 01:15:35 +0000
Subject: [PATCH] [packages] darkstat: use network.sh to find devices

SVN-Revision: 31969
---
 net/darkstat/Makefile            |  2 +-
 net/darkstat/files/darkstat.init | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/net/darkstat/Makefile b/net/darkstat/Makefile
index 7f170a6302..f0013c9a7c 100644
--- a/net/darkstat/Makefile
+++ b/net/darkstat/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=darkstat
 PKG_VERSION:=3.0.715
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://unix4lyfe.org/darkstat
diff --git a/net/darkstat/files/darkstat.init b/net/darkstat/files/darkstat.init
index 93bee6b619..8499e3e4d4 100644
--- a/net/darkstat/files/darkstat.init
+++ b/net/darkstat/files/darkstat.init
@@ -1,5 +1,5 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2007-2011 OpenWrt.org
+# Copyright (C) 2007-2012 OpenWrt.org
 
 START=60
 RUN_D=/var/empty
@@ -7,8 +7,7 @@ PID_F=$RUN_D/darkstat.pid
 
 start() {
 	mkdir -p $RUN_D
-	include /lib/network
-	scan_interfaces
+	. /lib/functions/network.sh
 	config_load darkstat
 	config_foreach start_darkstat darkstat
 }
@@ -19,14 +18,14 @@ start_darkstat() {
 	config_get httpaddr "$cfg" httpaddr
 	config_get httpport "$cfg" httpport
 
-	config_get ifname "$interface" ifname
-
-	/usr/sbin/darkstat --verbose \
-		-i "$ifname" \
-		${httpaddr:+-b "$httpaddr"} \
-		${httpport:+-p "$httpport"} \
-		--chroot $RUN_D \
-		--pidfile $PID_F
+	network_get_device ifname "$interface" && {
+		/usr/sbin/darkstat --verbose \
+			-i "$ifname" \
+			${httpaddr:+-b "$httpaddr"} \
+			${httpport:+-p "$httpport"} \
+			--chroot $RUN_D \
+			--pidfile $PID_F
+	}
 }
 
 stop() {
-- 
2.30.2