diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-03-01 12:25:02 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-03-01 12:25:02 +0000 |
| commit | c20e46f792b236a94c506b3e27131b6f9d3b774f (patch) | |
| tree | c545bbe42d372c07fa5a32e5721582eb22d47ad4 /package/network/services | |
| parent | 3069934e37334a74eee11b48f82e8d32a4c77b54 (diff) | |
| download | upstream-c20e46f792b236a94c506b3e27131b6f9d3b774f.tar.gz upstream-c20e46f792b236a94c506b3e27131b6f9d3b774f.tar.bz2 upstream-c20e46f792b236a94c506b3e27131b6f9d3b774f.zip | |
lldpd: fix passing multiple ifnames to the daemon
Instead of multiple -I arguments, lldpd expects a comma separated list.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
SVN-Revision: 44585
Diffstat (limited to 'package/network/services')
| -rw-r--r-- | package/network/services/lldpd/Makefile | 2 | ||||
| -rw-r--r-- | package/network/services/lldpd/files/lldpd.init | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/package/network/services/lldpd/Makefile b/package/network/services/lldpd/Makefile index 88982d1a86..5a1921e9d0 100644 --- a/package/network/services/lldpd/Makefile +++ b/package/network/services/lldpd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lldpd PKG_VERSION:=0.7.13 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://media.luffy.cx/files/lldpd diff --git a/package/network/services/lldpd/files/lldpd.init b/package/network/services/lldpd/files/lldpd.init index b2eea70fd3..2b1b223663 100644 --- a/package/network/services/lldpd/files/lldpd.init +++ b/package/network/services/lldpd/files/lldpd.init @@ -37,14 +37,15 @@ start() { local ifaces config_get ifaces 'config' 'interface' - local iface + local iface ifnames="" for iface in $ifaces; do local ifname="" if network_get_device ifname "$iface" || [ -e "/sys/class/net/$iface" ]; then - append args "-I ${ifname:-$iface}" + append ifnames "${ifname:-$iface}" "," fi done + [ -n "$ifnames" ] && append args "-I $ifnames" [ $enable_cdp -gt 0 ] && append args '-c' [ $enable_fdp -gt 0 ] && append args '-f' [ $enable_sonmp -gt 0 ] && append args '-s' |