From 296e1f253c77a2cbf5364a0e9f83fd9946ce9dbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Tue, 23 Jul 2019 12:16:03 +0200 Subject: netifd,lldpd,rpcd,log: use generic service_running MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit eb204d14f75c ("base-files: implement generic service_running") introduced generic service_running so it's not needed to copy&paste same 3 lines over and over again. I've removed service_running from netifd/network init script as well, because it was not working properly, looked quite strange and I didn't understand the intention: $ /etc/init.d/network stop $ service network running && echo "yes" || echo "nope" ( have to wait for 30s ) Command failed: Request timed out yes Signed-off-by: Petr Štetiar --- package/network/services/lldpd/files/lldpd.init | 4 ---- 1 file changed, 4 deletions(-) (limited to 'package/network/services/lldpd') diff --git a/package/network/services/lldpd/files/lldpd.init b/package/network/services/lldpd/files/lldpd.init index bc429de484..9fb3a82559 100644 --- a/package/network/services/lldpd/files/lldpd.init +++ b/package/network/services/lldpd/files/lldpd.init @@ -96,10 +96,6 @@ start_service() { procd_close_instance } -service_running() { - pgrep -x /usr/sbin/lldpd &> /dev/null -} - reload_service() { running || return 1 $LLDPCLI -u $LLDPSOCKET &> /dev/null <<-EOF -- cgit v1.2.3