ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-14 22:52:09 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

netifd,lldpd,rpcd,log: use generic service_running

Browse Source 
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>
This commit is contained in:
Petr Štetiar 2019-07-23 12:16:03 +02:00
parent 7519a36774
commit 296e1f253c
4 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/network/config/netifd/files/etc/init.d/network
View File

@ -40,11 +40,6 @@ stop_service() {
sleep 1 sleep 1
} }
service_running() {
ubus -t 30 wait_for network.interface
/sbin/wifi reload_legacy
}
validate_atm_bridge_section() validate_atm_bridge_section()
{ {
uci_validate_section network "atm-bridge" "${1}" \ uci_validate_section network "atm-bridge" "${1}" \

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

@ -96,10 +96,6 @@ start_service() {
procd_close_instance procd_close_instance
} }
service_running() {
pgrep -x /usr/sbin/lldpd &> /dev/null
}
reload_service() { reload_service() {
running || return 1 running || return 1
$LLDPCLI -u $LLDPSOCKET &> /dev/null <<-EOF $LLDPCLI -u $LLDPSOCKET &> /dev/null <<-EOF

4
package/system/rpcd/files/rpcd.init
View File

@ -18,7 +18,3 @@ start_service() {
reload_service() { reload_service() {
procd_send_signal rpcd procd_send_signal rpcd
} }
service_running() {
procd_running rpcd
}

4
package/system/ubox/files/log.init
View File

@ -96,7 +96,3 @@ start_service()
config_foreach validate_log_section system start_service_file config_foreach validate_log_section system start_service_file
config_foreach validate_log_section system start_service_remote config_foreach validate_log_section system start_service_remote
} }
service_running() {
procd_running log
}