mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-12-11 15:12:10 -05:00
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 <newtwen+github@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/14872
(cherry picked from commit a015f59880)
Link: https://github.com/openwrt/openwrt/pull/18343
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
parent
9e63e2410d
commit
bde35a6c7d
@ -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"
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user