From 91438db320a23e39438cf2ae79c42a6b4754ec63 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Fri, 24 Jul 2020 22:06:53 +0800 Subject: [PATCH 1/4] AdGuardHome: bump to v0.103.2 --- package/ntlf9t/AdGuardHome/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ntlf9t/AdGuardHome/Makefile b/package/ntlf9t/AdGuardHome/Makefile index 0244ff7a66..cc3fb9f9f8 100644 --- a/package/ntlf9t/AdGuardHome/Makefile +++ b/package/ntlf9t/AdGuardHome/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=AdGuardHome -PKG_VERSION:=0.102.0 +PKG_VERSION:=0.103.2 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/AdguardTeam/AdGuardHome -PKG_MIRROR_HASH:=e877e2d911248666862133c05cc007bb04c8a09ca727f6b4f3060bf06af0d562 +PKG_MIRROR_HASH:=4fac67c9196b68bbd9db9a441fa7a4c4a530623e2bbcda992948356005505aeb PKG_LICENSE:=GPL-3.0-only PKG_LICENSE_FILES:=LICENSE.txt From 2d8346e206d37bae110a29d94b8fe54284eaeb94 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Fri, 24 Jul 2020 22:52:49 +0800 Subject: [PATCH 2/4] luci-app-turboacc: fix indentation --- .../luci-app-turboacc/root/etc/init.d/turboacc | 14 +++++++------- package/network/services/ppp/files/ppp.sh | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/lean/luci-app-turboacc/root/etc/init.d/turboacc b/package/lean/luci-app-turboacc/root/etc/init.d/turboacc index ec8e279ff1..26904c6867 100755 --- a/package/lean/luci-app-turboacc/root/etc/init.d/turboacc +++ b/package/lean/luci-app-turboacc/root/etc/init.d/turboacc @@ -261,10 +261,10 @@ start(){ stop(){ inital_conf - uci set firewall.@defaults[0].flow_offloading="${sw_flow}" - uci set firewall.@defaults[0].flow_offloading_hw="${hw_flow}" + uci set firewall.@defaults[0].flow_offloading="${sw_flow}" + uci set firewall.@defaults[0].flow_offloading_hw="${hw_flow}" uci set firewall.@defaults[0].fullcone="${fullcone_nat}" - uci commit firewall + uci commit firewall [ "${sfe_flow}" -eq "0" ] && { echo "0" > "/sys/fast_classifier/skip_to_bridge_ingress" @@ -275,7 +275,7 @@ stop(){ [ "${dns_acc}" -eq "0" ] && rm -f "/tmp/dnsmasq.d/dnsmasq-googlehosts.conf" stop_dnscache - revert_dns + revert_dns if [ "${restart_utils}" = "true" ]; then /etc/init.d/dnsmasq restart >/dev/null 2>&1 && echo "DNSMASQ revert" @@ -284,9 +284,9 @@ stop(){ } restart(){ - restart_utils="false" - stop - start + restart_utils="false" + stop + start /etc/init.d/dnsmasq restart >/dev/null 2>&1 && echo "DNSMASQ restart" /etc/init.d/firewall restart >/dev/null 2>&1 } diff --git a/package/network/services/ppp/files/ppp.sh b/package/network/services/ppp/files/ppp.sh index 78e8c32136..0fe29993e3 100755 --- a/package/network/services/ppp/files/ppp.sh +++ b/package/network/services/ppp/files/ppp.sh @@ -233,8 +233,8 @@ proto_pppoe_setup() { #By 蝈蝈：并发拨号同步的前期准备 syncppp_option="" - [ "$(uci get syncdial.config.enabled)" -eq "1" ] && { - ppp_if_cnt=$(uci show network | grep -c "\.proto=\'pppoe\'$") + [ "$(uci get syncdial.config.enabled)" == "1" ] && { + ppp_if_cnt=$(cat /etc/config/network | grep -c "proto 'pppoe'") syncppp_option="syncppp $ppp_if_cnt" shellsync $ppp_if_cnt 10 } From 876540ebc1ddff72c892f57012dc10afcc629ec9 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 25 Jul 2020 00:06:47 +0800 Subject: [PATCH 3/4] config/images: enable console by default --- config/Config-images.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/Config-images.in b/config/Config-images.in index a87c40da6b..0231fbdfac 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -208,7 +208,7 @@ menu "Target Images" config GRUB_CONSOLE bool "Use Console Terminal (in addition to Serial)" depends on GRUB_IMAGES || EFI_IMAGES - default n + default y config GRUB_SERIAL string "Serial port device" From ac369da2159e553f4740a0fe548614047e658157 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 25 Jul 2020 00:17:28 +0800 Subject: [PATCH 4/4] ppp: revert change --- package/network/services/ppp/files/ppp.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/services/ppp/files/ppp.sh b/package/network/services/ppp/files/ppp.sh index 0fe29993e3..78e8c32136 100755 --- a/package/network/services/ppp/files/ppp.sh +++ b/package/network/services/ppp/files/ppp.sh @@ -233,8 +233,8 @@ proto_pppoe_setup() { #By 蝈蝈：并发拨号同步的前期准备 syncppp_option="" - [ "$(uci get syncdial.config.enabled)" == "1" ] && { - ppp_if_cnt=$(cat /etc/config/network | grep -c "proto 'pppoe'") + [ "$(uci get syncdial.config.enabled)" -eq "1" ] && { + ppp_if_cnt=$(uci show network | grep -c "\.proto=\'pppoe\'$") syncppp_option="syncppp $ppp_if_cnt" shellsync $ppp_if_cnt 10 }