From 860a5d1e6a270f74db8696ba382c0f4fb5b81695 Mon Sep 17 00:00:00 2001
From: LEAN-ESX <coolsnowwolf@gmail.com>
Date: Sat, 7 Mar 2020 19:42:46 -0800
Subject: [PATCH] Revert "luci-app-ssr-plus:ssr-ad separate control use
 (#3592)"

This reverts commit 84bf3aadcd77ce722a28aca49fb8c59661f69561.
---
 .../luci-app-ssr-plus/root/etc/init.d/shadowsocksr     | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
index 95e81ca6a..9a1023beb 100755
--- a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
+++ b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
@@ -524,9 +524,6 @@ start() {
 				conf-dir=/tmp/dnsmasq.oversea
 			EOF
 		fi
-		if [ -e "/tmp/dnsmasq.d/ad.conf" ]; then
-			rm -f /tmp/dnsmasq.d/ad.conf
-		fi
 		if [ $(uci_get_by_type global adblock 0) == "0" ]; then
 			rm -f /tmp/dnsmasq.ssr/ad.conf
 		fi
@@ -582,14 +579,9 @@ stop() {
 	else
 		kill -9 $(busybox ps -w | grep pdnsd | grep -v grep | awk '{print $1}') >/dev/null 2>&1
 	fi
-	if [ $(uci_get_by_type global adblock 0) == "0" ]; then
-		rm -f /tmp/dnsmasq.d/ad.conf
-	else
-		cp -f /etc/dnsmasq.ssr/ad.conf /tmp/dnsmasq.d/ad.conf
-	fi
 	if [ -f "/tmp/dnsmasq.d/dnsmasq-ssr.conf" ]; then
 		rm -f /tmp/dnsmasq.d/dnsmasq-ssr.conf
+		/etc/init.d/dnsmasq restart >/dev/null 2>&1
 	fi
-	/etc/init.d/dnsmasq restart >/dev/null 2>&1
 	del_cron
 }
-- 
GitLab