From: Stan Grishin <stangri@melmac.ca>
Date: Mon, 10 Feb 2025 21:18:24 +0000 (+0000)
Subject: https-dns-proxy: bugfix: start on boot
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4337232f516aa302c3ca85769f20355d768b14a6;p=feed%2Fpackages.git

https-dns-proxy: bugfix: start on boot

* bugfix: working start on boot when interfaces are up
  (thanks @tmcqueen-materials and @b1ackbeat)
* improvement: better output when setting triggers on start

Signed-off-by: Stan Grishin <stangri@melmac.ca>
---

diff --git a/net/https-dns-proxy/Makefile b/net/https-dns-proxy/Makefile
index 839046099e..454ab9e1d9 100644
--- a/net/https-dns-proxy/Makefile
+++ b/net/https-dns-proxy/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=https-dns-proxy
 PKG_VERSION:=2023.12.26
-PKG_RELEASE:=2
+PKG_RELEASE:=4
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy/
diff --git a/net/https-dns-proxy/files/etc/init.d/https-dns-proxy b/net/https-dns-proxy/files/etc/init.d/https-dns-proxy
index 94a164dcb7..a061ad09c4 100755
--- a/net/https-dns-proxy/files/etc/init.d/https-dns-proxy
+++ b/net/https-dns-proxy/files/etc/init.d/https-dns-proxy
@@ -134,10 +134,9 @@ append_bootstrap() {
 
 boot() {
 	ubus -t 30 wait_for network.interface 2>/dev/null
-	hdp_boot_flag=1
-	if is_resolver_working; then
-		rc_procd start_service 'on_boot' && service_started 'on_boot'
-	else
+	rc_procd start_service 'on_boot' && service_started 'on_boot'
+	if ! is_resolver_working; then
+		hdp_boot_flag=1
 		rc_procd stop_service 'on_failed_health_check' && service_stopped 'on_failed_health_check'
 	fi
 }
@@ -320,7 +319,7 @@ service_triggers() {
 			wan6="${wan6:-wan6}"
 		fi
 		output "Setting trigger${wan6:+s} for $wan ${wan6:+$wan6 }"
-		for i in "$wan" "$wan6"; do
+		for i in $wan $wan6; do
 			procd_add_interface_trigger "interface.*" "$i" "/etc/init.d/${packageName}" restart 'on_interface_trigger' && output_ok || output_fail
 		done
 		output '\n'