From: Toke Høiland-Jørgensen <redacted>
Date: Mon, 7 May 2018 09:48:26 +0000 (+0200)
Subject: acme: Change boot init script logic to invoke start
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=7e1dfc2dc589213166cc62ec374c6c21feccfcac;p=openwrt-packages.git

acme: Change boot init script logic to invoke start

The new procd config dependency tracking requires the start method to be
called even on boot. So add a state file that is checked by the run script
to condition the special-case boot run instead of the previous independent
call to the run script.

Ref: https://github.com/openwrt/luci/pull/1769

Signed-off-by: Toke Høiland-Jørgensen <redacted>
---

diff --git a/net/acme/Makefile b/net/acme/Makefile
index 7163ef6a6..205b5f122 100644
--- a/net/acme/Makefile
+++ b/net/acme/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=acme
 PKG_VERSION:=2.7.8
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_LICENSE:=GPLv3
 
 PKG_SOURCE_PROTO:=git
diff --git a/net/acme/files/acme.init b/net/acme/files/acme.init
index 6de12b7d0..a3d686dc7 100644
--- a/net/acme/files/acme.init
+++ b/net/acme/files/acme.init
@@ -25,7 +25,8 @@ stop_service() {
 }
 
 boot() {
-    $SCRIPT check_cron
+    touch "/var/run/acme_boot"
+    start
 }
 
 service_triggers()
diff --git a/net/acme/files/run.sh b/net/acme/files/run.sh
index a3a89ab97..368de26d3 100644
--- a/net/acme/files/run.sh
+++ b/net/acme/files/run.sh
@@ -234,6 +234,7 @@ load_vars()
 
 check_cron
 [ -n "$CHECK_CRON" ] && exit 0
+[ -e "/var/run/acme_boot" ] && rm -f "/var/run/acme_boot" && exit 0
 
 config_load acme
 config_foreach load_vars acme