Merge Mainline

This commit is contained in:
CN_SZTL 2020-07-25 00:27:32 +08:00
commit abc3581f44
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
3 changed files with 10 additions and 10 deletions

View File

@ -209,7 +209,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"

View File

@ -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
}

View File

@ -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