[OpenWrt-Devel] [PATCH 2/2] netifd, lldpd, rpcd, log: use generic service_running

[Yousong Zhou]

On Tue, 23 Jul 2019 at 18:25, Petr Štetiar <ynezz at true.cz> wrote:
>
> 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.
>
> Signed-off-by: Petr Štetiar <ynezz at true.cz>
> ---
>  package/network/config/netifd/files/etc/init.d/network | 5 -----
>  package/network/services/lldpd/files/lldpd.init        | 4 ----
>  package/system/rpcd/files/rpcd.init                    | 4 ----
>  package/system/ubox/files/log.init                     | 4 ----
>  4 files changed, 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 2321a309a5ce..dc208c4ce0a1 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
> -}
> -

Likely we should keep this.  If not, a note in the commit message could help.

                yousong

>  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 bc429de484d3..9fb3a8255995 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 77ebcbe6cb7b..447133c67a5a 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 ba9c124c8ba6..250f805b4406 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
> -}
>
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel at lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel

_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel