diff options
| author | Petr Štetiar <ynezz@true.cz> | 2019-09-21 10:53:48 +0200 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2019-11-18 06:28:57 +0100 |
| commit | 8383c19b908c17dce8b5572c171e7937f4310748 (patch) | |
| tree | 709de43e0aa0f7bfdfb5b8f308df58c2b5182b56 /net | |
| parent | df4811c6c33e81320d8980305ff63e7f850b1145 (diff) | |
treewide: fix service status command in procd compatible services
Fix breaking change introduced in the main tree with a commit
7519a36774ca ("base-files,procd: add generic service status") where the
old service `status` callback function doesn't work anymore and needs to
be renamed to `status_service`. This name was chosen for consistency
with start and stop function callbacks, which are using `start_service`
and `stop_service` naming schemes.
While at it, fix whitespace issues in the status_service as well.
Ref: http://lists.infradead.org/pipermail/openwrt-devel/2019-September/019035.html
Reported-by: Dirk Brenken <dev@brenken.org>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'net')
| -rw-r--r-- | net/apfree-wifidog/Makefile | 2 | ||||
| -rw-r--r-- | net/apfree-wifidog/files/wifidogx.init | 2 | ||||
| -rw-r--r-- | net/simple-adblock/Makefile | 2 | ||||
| -rw-r--r-- | net/simple-adblock/files/simple-adblock.init | 4 | ||||
| -rw-r--r-- | net/wifidog/Makefile | 2 | ||||
| -rw-r--r-- | net/wifidog/files/wifidog.init | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/net/apfree-wifidog/Makefile b/net/apfree-wifidog/Makefile index bea59df31..7778bdfef 100644 --- a/net/apfree-wifidog/Makefile +++ b/net/apfree-wifidog/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apfree-wifidog PKG_VERSION:=3.11.1716 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/liudf0716/apfree_wifidog.git diff --git a/net/apfree-wifidog/files/wifidogx.init b/net/apfree-wifidog/files/wifidogx.init index be87af5b9..b537c0ce8 100644 --- a/net/apfree-wifidog/files/wifidogx.init +++ b/net/apfree-wifidog/files/wifidogx.init @@ -280,6 +280,6 @@ start_service() { procd_close_instance } -status() { +status_service() { /usr/bin/wdctlx status } diff --git a/net/simple-adblock/Makefile b/net/simple-adblock/Makefile index bfda56c87..e15edd9c3 100644 --- a/net/simple-adblock/Makefile +++ b/net/simple-adblock/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=simple-adblock PKG_VERSION:=1.8.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net> PKG_LICENSE:=GPL-3.0-or-later diff --git a/net/simple-adblock/files/simple-adblock.init b/net/simple-adblock/files/simple-adblock.init index 6550ff9cc..7272af737 100644 --- a/net/simple-adblock/files/simple-adblock.init +++ b/net/simple-adblock/files/simple-adblock.init @@ -1028,9 +1028,9 @@ killcache() { return 0 } -status() { +status_service() { local status="$(tmpfs get status)" error="$(tmpfs get error)" message="$(tmpfs get message)" - if [ -n "$status" ] && [ -n "$message" ]; then + if [ -n "$status" ] && [ -n "$message" ]; then status="${status}: $message" fi [ -n "$status" ] && output "$serviceName $status\\n" diff --git a/net/wifidog/Makefile b/net/wifidog/Makefile index 03e78a38f..47367e474 100644 --- a/net/wifidog/Makefile +++ b/net/wifidog/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wifidog PKG_VERSION:=1.3.0 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/wifidog/wifidog-gateway diff --git a/net/wifidog/files/wifidog.init b/net/wifidog/files/wifidog.init index 6ebf64fbc..3078a001a 100644 --- a/net/wifidog/files/wifidog.init +++ b/net/wifidog/files/wifidog.init @@ -17,6 +17,6 @@ start_service() { procd_close_instance } -status() { +status_service() { /usr/bin/wdctl status } |