From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 22 Dec 2012 18:55:57 +0000 (+0000)
Subject: dropbear: use network_get_device instead of scan_interfaces to get the device name
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=82bd58c793ec64f532a36e8d10d9d8a81a90908f;p=openwrt%2Fstaging%2Fblocktrron.git

dropbear: use network_get_device instead of scan_interfaces to get the device name

SVN-Revision: 34863
---

diff --git a/package/network/services/dropbear/files/dropbear.init b/package/network/services/dropbear/files/dropbear.init
index c909d28965..6fc79017d9 100755
--- a/package/network/services/dropbear/files/dropbear.init
+++ b/package/network/services/dropbear/files/dropbear.init
@@ -61,7 +61,7 @@ dropbear_start()
 	local port
 	local interface
 	config_get interface "${section}" Interface
-	config_get interface "${interface}" ifname "$interface"
+	[ -n "$interface" ] && network_get_device interface "$interface"
 	config_get port "${section}" Port 22
 	append_ports "$interface" "$port"
 	# C) banner file
@@ -115,8 +115,9 @@ start()
 	[ -s /etc/dropbear/dropbear_rsa_host_key -a \
 	  -s /etc/dropbear/dropbear_dss_host_key ] || keygen
 
-	include /lib/network
-	scan_interfaces
+	. /lib/functions.sh
+	. /lib/functions/network.sh
+
 	config_load "${NAME}"
 	config_foreach dropbear_start dropbear
 }