From a015f59880c72a1bdd07de32491f85ce7f8d2a1c Mon Sep 17 00:00:00 2001 From: Paul Donald Date: Sun, 21 Apr 2024 23:18:36 +0200 Subject: [PATCH] lldpd: get_config_cid_ifaces() -> get_interface_csv() where csv = comma separated value(s) Make the function more generic. Can use it for not only 'config'. Now it can be used to parse interfaces for additional lldpd settings, e.g. custom-tlv. Tested on: 22.03.6 Signed-off-by: Paul Donald Link: https://github.com/openwrt/openwrt/pull/14872 Signed-off-by: Robert Marko --- package/network/services/lldpd/files/lldpd.init | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/network/services/lldpd/files/lldpd.init b/package/network/services/lldpd/files/lldpd.init index 6c1c184bfa1..2ad59f8cb14 100644 --- a/package/network/services/lldpd/files/lldpd.init +++ b/package/network/services/lldpd/files/lldpd.init @@ -75,9 +75,9 @@ get_config_restart_hash() { export -n "$var=$_hash" } -get_config_cid_ifaces() { +get_interface_csv() { local _ifaces - config_get _ifaces 'config' "$2" + config_get _ifaces "$2" "$3" local _iface _ifnames="" # Set noglob to prevent '*' capturing diverse file names in the for ... in @@ -109,7 +109,7 @@ write_lldpd_conf() config_get lldp_hostname 'config' 'lldp_hostname' "$(cat /proc/sys/kernel/hostname)" local ifnames - get_config_cid_ifaces ifnames "interface" + get_interface_csv ifnames 'config' "interface" local lldp_mgmt_ip config_get lldp_mgmt_ip 'config' 'lldp_mgmt_ip' @@ -335,7 +335,7 @@ start_service() { # ChassisID interfaces local ifnames - get_config_cid_ifaces ifnames "cid_interface" + get_interface_csv ifnames 'config' "cid_interface" [ -n "$ifnames" ] && procd_append_param command -C "$ifnames" -- 2.47.2