From cae8be6667d45dd9121a40f0177fa2ddd9fb9fdb Mon Sep 17 00:00:00 2001 From: bol-van Date: Wed, 2 Mar 2022 11:47:27 +0300 Subject: [PATCH] install_easy: do not always remove/reinstall fw3 include --- install_easy.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/install_easy.sh b/install_easy.sh index 08501c2..fb50c34 100755 --- a/install_easy.sh +++ b/install_easy.sh @@ -854,13 +854,15 @@ install_openwrt() FW_SCRIPT_SRC="$EXEDIR/init.d/openwrt/firewall.zapret" OPENWRT_FW_INCLUDE=/etc/firewall.zapret OPENWRT_IFACE_HOOK="$EXEDIR/init.d/openwrt/90-zapret" - + check_bins require_root check_location copy_openwrt install_binaries check_dns + FWTYPE_OLD=$FWTYPE + echo \* stopping current firewall rules/daemons "$INIT_SCRIPT_SRC" stop_fw "$INIT_SCRIPT_SRC" stop_daemons @@ -873,7 +875,7 @@ install_openwrt() ask_config_offload # stop and reinstall 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 clear_ipset download_list