diff --git a/luci-app-bypass/Makefile b/luci-app-bypass/Makefile index b396302fd..5093b8e35 100644 --- a/luci-app-bypass/Makefile +++ b/luci-app-bypass/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-bypass PKG_VERSION:=1.2 -PKG_RELEASE:=76 +PKG_RELEASE:=77 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server \ diff --git a/luci-app-bypass/luasrc/model/cbi/bypass/base.lua b/luci-app-bypass/luasrc/model/cbi/bypass/base.lua index cf74e2d2a..c3a7c7101 100644 --- a/luci-app-bypass/luasrc/model/cbi/bypass/base.lua +++ b/luci-app-bypass/luasrc/model/cbi/bypass/base.lua @@ -66,7 +66,7 @@ o:depends("run_mode","router") o.default=1 end -if luci.sys.call("test `grep MemTotal /proc/meminfo | awk '{print $2}'` -gt 500000") == 0 then +if luci.sys.call("test `grep MemTotal /proc/meminfo | awk '{print $2}'` -gt 233000") == 0 then o=s:option(Flag,"adguardhome",translate("Used with AdGuardHome"), translate("Luci-app-adguardhome require")) if luci.sys.call("test `which AdGuardHome` && test -r /etc/init.d/AdGuardHome") == 0 then diff --git a/luci-app-bypass/root/etc/init.d/bypass b/luci-app-bypass/root/etc/init.d/bypass index 587d17b81..890b31bad 100755 --- a/luci-app-bypass/root/etc/init.d/bypass +++ b/luci-app-bypass/root/etc/init.d/bypass @@ -44,7 +44,7 @@ uci_get_by_type(){ GLOBAL_SERVER=$(uci_get_by_type global global_server) adguardhome=$(uci_get_by_type global adguardhome 0) -gfw_mode=$(uci_get_by_type global gfw_mode 0) +gfw_mode=$(uci_get_by_type global gfw_mode 1) run_mode=$(uci_get_by_type global run_mode router) SO_SERVER=$(uci_get_by_type socks5_proxy server 0) [ $SO_SERVER = same ] && SO_SERVER=$GLOBAL_SERVER