From 55f41f80862698840b97b25562b6a1d069c087f7 Mon Sep 17 00:00:00 2001
From: gitea-action <git@cooluc.com>
Date: Sun, 15 Dec 2024 03:00:21 +0800
Subject: [PATCH] luci-app-passwall2: sync upstream

last commit: https://github.com/xiaorouji/openwrt-passwall2/commit/6b51bb6b18ee0f4af9db738c6c2a6a6c9cb8e7e5
---
 luci-app-passwall2/root/usr/share/passwall2/app.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/luci-app-passwall2/root/usr/share/passwall2/app.sh b/luci-app-passwall2/root/usr/share/passwall2/app.sh
index a735a54d7..95be20850 100755
--- a/luci-app-passwall2/root/usr/share/passwall2/app.sh
+++ b/luci-app-passwall2/root/usr/share/passwall2/app.sh
@@ -990,12 +990,10 @@ run_copy_dnsmasq() {
 	mkdir -p $dnsmasq_conf_path
 	[ -s "/tmp/etc/dnsmasq.conf.${DEFAULT_DNSMASQ_CFGID}" ] && {
 		cp -r /tmp/etc/dnsmasq.conf.${DEFAULT_DNSMASQ_CFGID} $dnsmasq_conf
+		sed -i "/passwall2/d" $dnsmasq_conf
 		sed -i "/ubus/d" $dnsmasq_conf
 		sed -i "/dhcp/d" $dnsmasq_conf
 		sed -i "/port=/d" $dnsmasq_conf
-		sed -i "/conf-dir/d" $dnsmasq_conf
-		sed -i "/no-poll/d" $dnsmasq_conf
-		sed -i "/no-resolv/d" $dnsmasq_conf
 		sed -i "/server=/d" $dnsmasq_conf
 	}
 	local set_type="ipset"