lldpd: fix restart
authorPaul Donald <newtwen+github@gmail.com>
Tue, 2 Apr 2024 11:42:20 +0000 (13:42 +0200)
committerChristian Marangi <ansuelsmth@gmail.com>
Fri, 12 Apr 2024 11:20:06 +0000 (13:20 +0200)
Redirection broke in 5364fe0f01ca ("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: 5364fe0f01ca ("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>
package/network/services/lldpd/files/lldpd.init

index 67ee011ae235416e0cc108e896ef474ad8115662..ca09a501f6b56d6fd4ffd70d055fdc01980caa6f 100644 (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
 }