From c92bf3699aa98a4965f54019feea2d523ef1ba72 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 26 Aug 2019 21:07:17 +0200
Subject: [PATCH] Check for pihole when all is configured

---
 openmptcprouter/files/etc/init.d/openmptcprouter-vps | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index e3dc5d9a1..6068c8b8d 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -278,7 +278,7 @@ set_pihole() {
 			set openmptcprouter.${servername}.pihole='1'
 			commit openmptcprouter
 		EOF
-	elif [ "$piholeomr" != "0" ]; then
+	elif [ "$pihole" = "false" ] && [ "$piholeomr" != "0" ]; then
 		uci -q batch <<-EOF >/dev/null
 			set openmptcprouter.${servername}.pihole='0'
 			commit openmptcprouter
@@ -688,7 +688,6 @@ _config_service() {
 		}
 	fi
 	uci -q set openmptcprouter.settings.firstboot=0
-	set_pihole
 
 	config_load shadowsocks-libev
 	config_foreach _set_ss_server_vps server
@@ -701,6 +700,7 @@ _config_service() {
 	[ -z "$(_set_redirect_ports_from_vps $redirect_port)" ] && error=1
 	[ -z "$(_set_mptcp_vps)" ] && error=1
 	[ -z "$(_set_vpn_vps)" ] && error=1
+	set_pihole
 	[ "$error" = 0 ] && uci -q set openmptcprouter.${servername}.lastchange=$(date "+%s")
 	uci -q batch <<-EOF >/dev/null
 		set openmptcprouter.${servername}.admin_error=$error