From 8383c19b908c17dce8b5572c171e7937f4310748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sat, 21 Sep 2019 10:53:48 +0200 Subject: [PATCH] treewide: fix service status command in procd compatible services MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Petr Štetiar --- libs/postgresql/Makefile | 2 +- libs/postgresql/files/postgresql.init | 5 +---- net/apfree-wifidog/Makefile | 2 +- net/apfree-wifidog/files/wifidogx.init | 2 +- net/simple-adblock/Makefile | 2 +- net/simple-adblock/files/simple-adblock.init | 4 ++-- net/wifidog/Makefile | 2 +- net/wifidog/files/wifidog.init | 2 +- 8 files changed, 9 insertions(+), 12 deletions(-) diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile index 810f59c550..6f57e8f8ba 100644 --- a/libs/postgresql/Makefile +++ b/libs/postgresql/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=postgresql PKG_VERSION:=11.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=PostgreSQL PKG_CPE_ID:=cpe:/a:postgresql:postgresql diff --git a/libs/postgresql/files/postgresql.init b/libs/postgresql/files/postgresql.init index 959f3271c2..3d3dbadf47 100644 --- a/libs/postgresql/files/postgresql.init +++ b/libs/postgresql/files/postgresql.init @@ -6,9 +6,6 @@ PROG=/usr/bin/postmaster USE_PROCD=1 -EXTRA_COMMANDS="status" -EXTRA_HELP=" status Show current status of the PostgreSQL server" - fix_hosts() { # make sure localhost (without a dot) is in /etc/hosts grep -q 'localhost$' /etc/hosts || echo '127.0.0.1 localhost' >> /etc/hosts @@ -71,7 +68,7 @@ stop_service() { /usr/bin/pg_ctl stop -U postgres -D "${pgdata}" -s } -status() { +status_service() { config_load "postgresql" config_get pgdata config PGDATA /usr/bin/pg_ctl status -U postgres -D "${pgdata}" diff --git a/net/apfree-wifidog/Makefile b/net/apfree-wifidog/Makefile index bea59df315..7778bdfef4 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 be87af5b99..b537c0ce8a 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 bfda56c870..e15edd9c32 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 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 6550ff9cc1..7272af7370 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 03e78a38fc..47367e4744 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 6ebf64fbcb..3078a001a6 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 }