drygdryg/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2024-11-26 20:20:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

install_easy: do not always remove/reinstall fw3 include

Browse Source
This commit is contained in:
bol-van 2022-03-02 11:47:27 +03:00
parent 8c4102eaef
commit cae8be6667
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install_easy.sh
View File

@ -854,13 +854,15 @@ install_openwrt()
FW_SCRIPT_SRC="$EXEDIR/init.d/openwrt/firewall.zapret" FW_SCRIPT_SRC="$EXEDIR/init.d/openwrt/firewall.zapret"
OPENWRT_FW_INCLUDE=/etc/firewall.zapret OPENWRT_FW_INCLUDE=/etc/firewall.zapret
OPENWRT_IFACE_HOOK="$EXEDIR/init.d/openwrt/90-zapret" OPENWRT_IFACE_HOOK="$EXEDIR/init.d/openwrt/90-zapret"
check_bins check_bins
require_root require_root
check_location copy_openwrt check_location copy_openwrt
install_binaries install_binaries
check_dns check_dns
FWTYPE_OLD=$FWTYPE
echo \* stopping current firewall rules/daemons echo \* stopping current firewall rules/daemons
"$INIT_SCRIPT_SRC" stop_fw "$INIT_SCRIPT_SRC" stop_fw
"$INIT_SCRIPT_SRC" stop_daemons "$INIT_SCRIPT_SRC" stop_daemons
@ -873,7 +875,7 @@ install_openwrt()
ask_config_offload ask_config_offload
# stop and reinstall sysv init # stop and reinstall sysv init
install_sysv_init install_sysv_init
remove_openwrt_firewall [ "$FWTYPE_OLD" != "$FWTYPE" -a "$FWTYPE_OLD" = iptables -a -n "$OPENWRT_FW3" ] && remove_openwrt_firewall
# free some RAM # free some RAM
clear_ipset clear_ipset
download_list download_list