lldpd: implement a reload hook
authorFelix Fietkau <nbd@openwrt.org>
Tue, 3 Nov 2015 11:59:09 +0000 (11:59 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Tue, 3 Nov 2015 11:59:09 +0000 (11:59 +0000)
Seems the default one is not working as expected.
The way that reload should work is that the 'start' service
call should return 1 (if lldpd is running) and then a normal
restart would be called.

However, for lldpd a reload would mean just clearing all custom TLVs
(if they're configured) and reloading the configuration.

So, this patch adds a reload hook, which would:
 - 'start' lldpd if it's not running (because we return 1 if not running)
 - reload configuration if it is running (also previously
    clearing custom TLVs if present)

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
SVN-Revision: 47367

package/network/services/lldpd/files/lldpd.init

index 3d7d8b93d328f0de92f1dd60755e747d5110e06d..04e5b8ca637c694694d565a074387b9ee8f96dcf 100644 (file)
@@ -4,6 +4,8 @@
 START=90
 
 USE_PROCD=1
+LLDPCLI=/usr/sbin/lldpcli
+LLDPSOCKET=/var/run/lldpd.socket
 
 find_release_info()
 {
@@ -71,6 +73,21 @@ start_service() {
        procd_close_instance
 }
 
+service_running() {
+       pgrep -x /usr/sbin/lldpd &> /dev/null
+}
+
+reload_service() {
+       running || return 1
+       # Custom TLVs are special and should be
+       # reloaded from config during lldpd reload
+       $LLDPCLI -u $LLDPSOCKET unconfigure lldp custom-tlv &> /dev/null
+       $LLDPCLI -u $LLDPSOCKET -c /etc/lldpd.conf -c /etc/lldpd.d &> /dev/null
+       # Broadcast update over the wire
+       $LLDPCLI -u $LLDPSOCKET update &> /dev/null
+       return 0
+}
+
 stop_service() {
-       rm -f /var/run/lldpd.socket /var/run/lldpd.pid
+       rm -rf /var/run/lldp $LLDPSOCKET
 }