luci-app-passwall: sync with upstream source

This commit is contained in:
CN_SZTL 2020-04-09 01:41:07 +08:00
parent ec9d0a6834
commit 0247ff663b
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 5 additions and 5 deletions

View File

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall
PKG_VERSION:=3.6
PKG_RELEASE:=37
PKG_RELEASE:=38
PKG_DATE:=20200406
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

View File

@ -485,7 +485,7 @@ node_switch() {
local node_net=$(echo $1 | tr 'A-Z' 'a-z')
uci set $CONFIG.@global[0].${node_net}_node${i}=$node
uci commit $CONFIG
/etc/init.d/dnsmasq restart >/dev/null 2>&1 &
/etc/init.d/dnsmasq restart >/dev/null 2>&1
}
}
@ -711,7 +711,7 @@ add_dnsmasq() {
no-resolv
EOF
echolog "你没有设置接口DNS请前往设置"
/etc/init.d/dnsmasq restart >/dev/null 2>&1 &
/etc/init.d/dnsmasq restart >/dev/null 2>&1
}
}
fi
@ -791,7 +791,7 @@ stop_dnsmasq() {
rm -rf /var/dnsmasq.d/dnsmasq-$CONFIG.conf
rm -rf $DNSMASQ_PATH/dnsmasq-$CONFIG.conf
rm -rf $TMP_DNSMASQ_PATH
/etc/init.d/dnsmasq restart >/dev/null 2>&1 &
/etc/init.d/dnsmasq restart >/dev/null 2>&1
}
start_haproxy() {
@ -948,7 +948,7 @@ start() {
start_dns
add_dnsmasq
source $APP_PATH/iptables.sh start
/etc/init.d/dnsmasq restart >/dev/null 2>&1 &
/etc/init.d/dnsmasq restart >/dev/null 2>&1
start_crontab
echolog "运行完成!\n"
rm -f "$LOCK_FILE"