diff --git a/luci-app-ssr-plus/po/zh-cn/ssr-plus.po b/luci-app-ssr-plus/po/zh-cn/ssr-plus.po index 5690b303c..7fea718d3 100644 --- a/luci-app-ssr-plus/po/zh-cn/ssr-plus.po +++ b/luci-app-ssr-plus/po/zh-cn/ssr-plus.po @@ -458,16 +458,16 @@ msgid "DNS Server IP:Port" msgstr "DNS 服务器 IP:Port" msgid "Domestic DNS Server" -msgstr "国内DNS服务器" +msgstr "国内 DNS 服务器" msgid "Use DNS from WAN" -msgstr "使用WAN下发的DNS" +msgstr "使用 WAN 下发的 DNS" msgid "Use DNS from WAN and 114DNS" -msgstr "使用WAN下发的DNS和114DNS" +msgstr "使用 WAN 下发的 DNS 和 114DNS" msgid "Custom DNS Server format as IP:PORT (default: disabled)" -msgstr "格式为 IP:PORT (默认: 禁用)" +msgstr "格式为 IP:PORT(默认:禁用)" msgid "Update time (every day)" msgstr "更新时间(每天)" diff --git a/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/luci-app-ssr-plus/root/etc/init.d/shadowsocksr index 817f2e6e9..5d6a51e16 100755 --- a/luci-app-ssr-plus/root/etc/init.d/shadowsocksr +++ b/luci-app-ssr-plus/root/etc/init.d/shadowsocksr @@ -206,12 +206,11 @@ start_dns() { ln_start_bin $(first_type chinadns-ng) chinadns-ng -l $china_dns_port -4 china -p 3 -c ${chinadns/:/#} -t 127.0.0.1#$dns_port -N -f -r - uci -q rename "dhcp.@dnsmasq[0].noresolv"="_orig_noresolv" - uci -q rename "dhcp.@dnsmasq[0].server"="_orig_server" - uci -q set "dhcp.@dnsmasq[0].noresolv"="1" - uci -q add_list "dhcp.@dnsmasq[0].server"="127.0.0.1#$china_dns_port" - uci -q set "dhcp.@dnsmasq[0]._unused_ssrp_changed"=1 - uci -q commit "dhcp" + cat <<-EOF >> "$TMP_DNSMASQ_PATH/chinadns_fixed_server.conf" + no-poll + no-resolv + server=127.0.0.1#$china_dns_port + EOF fi fi fi