ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-18 10:46:41 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

lldpd: fix restart

Browse Source 
Redirection broke in 5364fe0f01 ("lldpd: shellcheck fixes")

redirects to /dev/null shall be handled correctly (i.e. last).

This fixes these errors on `/etc/init.d/lldpd reload`:

2024-03-16T20:39:00 [WARN/lldpctl] unknown command from argument 1: `/dev/null`
2024-03-16T20:39:00 [WARN/lldpctl] unknown command from argument 1: `/dev/null`
2024-03-16T20:39:00 [WARN/lldpctl] unknown command from argument 1: `/dev/null`
2024-03-16T20:39:00 [WARN/lldpctl] unknown command from argument 1: `/dev/null`

Tested-on: 22.03.6
Fixes: 5364fe0f01 ("lldpd: shellcheck fixes")
Signed-off-by: Paul Donald <newtwen+github@gmail.com>
[ improve commit description, add fixes tag ]
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Paul Donald 2024-04-02 13:42:20 +02:00 committed by Christian Marangi
parent 07918e6612
commit 8cf1dce428
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -349,7 +349,7 @@ reload_service() {
return 0
fi
$LLDPCLI -u "$LLDPSOCKET" 2>&1 /dev/null <<-EOF
$LLDPCLI -u "$LLDPSOCKET" >/dev/null 2>&1 <<-EOF
pause
unconfigure lldp custom-tlv
unconfigure system interface pattern
@ -359,7 +359,7 @@ reload_service() {
unconfigure system platform
EOF
if [ "$CONFIG_LLDPD_WITH_LLDPMED" = "y" ]; then
$LLDPCLI -u "$LLDPSOCKET" 2>&1 /dev/null <<-EOF
$LLDPCLI -u "$LLDPSOCKET" >/dev/null 2>&1 <<-EOF
unconfigure med fast-start
EOF
@ -367,9 +367,9 @@ reload_service() {
# Rewrite lldpd.conf
# If something changed it should be included by the lldpcli call
write_lldpd_conf
$LLDPCLI -u "$LLDPSOCKET" -c "$LLDPD_CONF" -c "$LLDPD_CONFS_DIR" 2>&1 /dev/null
$LLDPCLI -u "$LLDPSOCKET" -c "$LLDPD_CONF" -c "$LLDPD_CONFS_DIR" >/dev/null 2>&1
# Broadcast update over the wire
$LLDPCLI -u "$LLDPSOCKET" 2>&1 /dev/null <<-EOF
$LLDPCLI -u "$LLDPSOCKET" >/dev/null 2>&1 <<-EOF
resume
update
EOF
@ -377,6 +377,6 @@ reload_service() {
}
stop_service() {
rm -rf ${LLDPD_RUN} "$LLDPSOCKET" 2> /dev/null
rm -rf ${LLDPD_RUN} "$LLDPSOCKET" >/dev/null 2>&1
}