domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lldpd: fix passing multiple ifnames to the daemon

Browse Source 
Instead of multiple -I arguments, lldpd expects a comma separated list.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 44585
This commit is contained in:
Jo-Philipp Wich
2015-03-01 12:25:02 +00:00
parent 3069934e37
commit c20e46f792
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/network/services/lldpd/Makefile
View File

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=lldpd PKG_NAME:=lldpd
PKG_VERSION:=0.7.13 PKG_VERSION:=0.7.13
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://media.luffy.cx/files/lldpd PKG_SOURCE_URL:=http://media.luffy.cx/files/lldpd

5
package/network/services/lldpd/files/lldpd.init
View File

@@ -37,14 +37,15 @@ start() {
local ifaces local ifaces
config_get ifaces 'config' 'interface' config_get ifaces 'config' 'interface'
local iface local iface ifnames=""
for iface in $ifaces; do for iface in $ifaces; do
local ifname="" local ifname=""
if network_get_device ifname "$iface" || [ -e "/sys/class/net/$iface" ]; then if network_get_device ifname "$iface" || [ -e "/sys/class/net/$iface" ]; then
append args "-I ${ifname:-$iface}" append ifnames "${ifname:-$iface}" ","
fi fi
done done
[ -n "$ifnames" ] && append args "-I $ifnames"
[ $enable_cdp -gt 0 ] && append args '-c' [ $enable_cdp -gt 0 ] && append args '-c'
[ $enable_fdp -gt 0 ] && append args '-f' [ $enable_fdp -gt 0 ] && append args '-f'
[ $enable_sonmp -gt 0 ] && append args '-s' [ $enable_sonmp -gt 0 ] && append args '-s'