aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2019-07-23 12:16:03 +0200
committerPetr Štetiar <ynezz@true.cz>2019-09-15 22:53:01 +0200
commit296e1f253c77a2cbf5364a0e9f83fd9946ce9dbf (patch)
treef31ee69708c154336c1726b0304c5d6ed2ecdadf
parent7519a36774ca0e50dfae6a4b9fea75cab95171a5 (diff)
downloadupstream-296e1f253c77a2cbf5364a0e9f83fd9946ce9dbf.tar.gz
upstream-296e1f253c77a2cbf5364a0e9f83fd9946ce9dbf.tar.bz2
upstream-296e1f253c77a2cbf5364a0e9f83fd9946ce9dbf.zip
netifd,lldpd,rpcd,log: use generic service_running
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 <ynezz@true.cz>
-rwxr-xr-xpackage/network/config/netifd/files/etc/init.d/network5
-rw-r--r--package/network/services/lldpd/files/lldpd.init4
-rwxr-xr-xpackage/system/rpcd/files/rpcd.init4
-rw-r--r--package/system/ubox/files/log.init4
4 files changed, 0 insertions, 17 deletions
diff --git a/package/network/config/netifd/files/etc/init.d/network b/package/network/config/netifd/files/etc/init.d/network
index 2321a309a5..dc208c4ce0 100755
--- a/package/network/config/netifd/files/etc/init.d/network
+++ b/package/network/config/netifd/files/etc/init.d/network
@@ -40,11 +40,6 @@ stop_service() {
sleep 1
}
-service_running() {
- ubus -t 30 wait_for network.interface
- /sbin/wifi reload_legacy
-}
-
validate_atm_bridge_section()
{
uci_validate_section network "atm-bridge" "${1}" \
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
diff --git a/package/system/rpcd/files/rpcd.init b/package/system/rpcd/files/rpcd.init
index 77ebcbe6cb..447133c67a 100755
--- a/package/system/rpcd/files/rpcd.init
+++ b/package/system/rpcd/files/rpcd.init
@@ -18,7 +18,3 @@ start_service() {
reload_service() {
procd_send_signal rpcd
}
-
-service_running() {
- procd_running rpcd
-}
diff --git a/package/system/ubox/files/log.init b/package/system/ubox/files/log.init
index ba9c124c8b..250f805b44 100644
--- a/package/system/ubox/files/log.init
+++ b/package/system/ubox/files/log.init
@@ -96,7 +96,3 @@ start_service()
config_foreach validate_log_section system start_service_file
config_foreach validate_log_section system start_service_remote
}
-
-service_running() {
- procd_running log
-}