[openwrt/openwrt] lldpd: remove unneeded quotes and variable quoting

LEDE Commits lede-commits at lists.infradead.org
Tue Sep 17 03:36:38 PDT 2024


robimarko pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/8766fed5cdc016e9fff402990f57c31384e2336c

commit 8766fed5cdc016e9fff402990f57c31384e2336c
Author: Paul Donald <newtwen at gmail.com>
AuthorDate: Thu Feb 8 21:44:56 2024 +0100

    lldpd: remove unneeded quotes and variable quoting
    
    from commit ac771313ebedd2c4bfda8adef47650d45d77c32d
    
    portidsubtype takes 1 of 2 possible keywords which do not need quoting:
    
             configure lldp portidsubtype ifname | macaddress
    
    The third keyword 'local' is used in the syntax when individual ports
    are being defined:
    
             configure [ports ethX [,…]] lldp portidsubtype local value
    
    When this syntax is used, quoting is useful (see test cases for lldpd).
    In the init file, the 'local' syntax is unused.
    
    Tested on 22.03.5
    
    Signed-off-by: Paul Donald <newtwen at gmail.com>
    (cherry picked from commit bd1b17d589bc622408cebdd9fa0f43386cc3ef5a)
    Link: https://github.com/openwrt/openwrt/pull/15299
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 package/network/services/lldpd/files/lldpd.init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/network/services/lldpd/files/lldpd.init b/package/network/services/lldpd/files/lldpd.init
index 243a32c937..5d06e13aa5 100644
--- a/package/network/services/lldpd/files/lldpd.init
+++ b/package/network/services/lldpd/files/lldpd.init
@@ -154,7 +154,7 @@ write_lldpd_conf()
 		fi
 	fi
 	[ -n "$lldp_agenttype" ] && echo "configure lldp agent-type $lldp_agenttype" >> "$LLDPD_CONF"
-	[ -n "$lldp_portidsubtype" ] && echo "configure lldp portidsubtype" "\"$lldp_portidsubtype\"" >> "$LLDPD_CONF"
+	[ -n "$lldp_portidsubtype" ] && echo "configure lldp portidsubtype $lldp_portidsubtype" >> "$LLDPD_CONF"
 	[ -n "$lldp_platform" ] && echo "configure system platform" "\"$lldp_platform\"" >> "$LLDPD_CONF"
 	[ $lldp_tx_interval -gt 0 ] && echo "configure lldp tx-interval" "$lldp_tx_interval" >> "$LLDPD_CONF"
 	[ $lldp_tx_hold -gt 0 ] && echo "configure lldp tx-hold" "$lldp_tx_hold" >> "$LLDPD_CONF"




More information about the lede-commits mailing list