From 4162426d4ee96f663edac6474e62cfcf38721370 Mon Sep 17 00:00:00 2001 From: xiaorouji <60100640+xiaorouji@users.noreply.github.com> Date: Mon, 25 Apr 2022 16:45:56 +0800 Subject: [PATCH] luci: fix --- luci-app-passwall/Makefile | 2 +- luci-app-passwall/root/usr/share/passwall/helper_dnsmasq.sh | 6 +++--- .../root/usr/share/passwall/helper_smartdns.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index 4cdb05bb2..e24f8f47b 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall PKG_VERSION:=4.53 -PKG_RELEASE:=10 +PKG_RELEASE:=11 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_Transparent_Proxy \ diff --git a/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq.sh b/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq.sh index cd35dd960..0d53dc2c9 100755 --- a/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq.sh +++ b/luci-app-passwall/root/usr/share/passwall/helper_dnsmasq.sh @@ -45,10 +45,10 @@ logic_restart() { for server in $(uci -q get dhcp.@dnsmasq[0].server); do [ -n "$(echo $server | grep '\/')" ] || uci -q del_list dhcp.@dnsmasq[0].server="$server" done - /etc/init.d/dnsmasq restart >/dev/null 2>&1 & + /etc/init.d/dnsmasq restart >/dev/null 2>&1 restore_servers else - /etc/init.d/dnsmasq restart >/dev/null 2>&1 & + /etc/init.d/dnsmasq restart >/dev/null 2>&1 fi echolog "重启 dnsmasq 服务" LOG_FILE=${_LOG_FILE} @@ -59,7 +59,7 @@ restart() { eval_set_val $@ _LOG_FILE=$LOG_FILE [ -n "$no_log" ] && LOG_FILE="/dev/null" - /etc/init.d/dnsmasq restart >/dev/null 2>&1 & + /etc/init.d/dnsmasq restart >/dev/null 2>&1 echolog "重启 dnsmasq 服务" LOG_FILE=${_LOG_FILE} } diff --git a/luci-app-passwall/root/usr/share/passwall/helper_smartdns.sh b/luci-app-passwall/root/usr/share/passwall/helper_smartdns.sh index b63f53beb..7d6d4712c 100755 --- a/luci-app-passwall/root/usr/share/passwall/helper_smartdns.sh +++ b/luci-app-passwall/root/usr/share/passwall/helper_smartdns.sh @@ -6,7 +6,7 @@ restart() { _LOG_FILE=$LOG_FILE [ -n "$no_log" ] && LOG_FILE="/dev/null" rm -rf /tmp/smartdns.cache - /etc/init.d/smartdns reload >/dev/null 2>&1 & + /etc/init.d/smartdns reload >/dev/null 2>&1 LOG_FILE=${_LOG_FILE} } @@ -20,7 +20,7 @@ del() { rm -rf /tmp/etc/smartdns/passwall.conf sed -i "/passwall/d" /etc/smartdns/custom.conf >/dev/null 2>&1 rm -rf /tmp/smartdns.cache - /etc/init.d/smartdns reload >/dev/null 2>&1 & + /etc/init.d/smartdns reload >/dev/null 2>&1 } arg1=$1