install_easy: in openwrt clear ipsets during install to save RAM

bol-van · Nov 13, 2020 · bc7ed63 · bc7ed63
1 parent 33dbc5b
commit bc7ed63
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/install_easy.sh b/install_easy.sh
@@ -716,7 +716,7 @@ is_linked_to_busybox()
 	F=/bin/$1
 	P="$(readlink $F)"
 	if [ -z "$P" ] && [ -x $F ] && [ ! -L $F ]; then false; return; fi
-	[ "${P%busybox*}" != "$P" ] && return
+	[ "${P%busybox*}" != "$P" ]
 }
 
 check_prerequisites_openwrt()
@@ -868,6 +868,9 @@ remove_openwrt_firewall()
 	openwrt_fw_section_del
 	# from old zapret versions. now we use single include
 	openwrt_fw_section_del 6
+
+	# free some RAM
+	"$EXEDIR/ipset/create_ipset.sh" clear
 }
 
 install_openwrt_iface_hook()

diff --git a/ipset/create_ipset.sh b/ipset/create_ipset.sh
@@ -18,6 +18,7 @@ IPSET_SAVERAM_MIN_FILESIZE=131072
 
 while [ -n "$1" ]; do
 	[ "$1" = "no-update" ] && NO_UPDATE=1
+	[ "$1" = "clear" ] && DO_CLEAR=1
 	shift
 done
 
@@ -112,9 +113,11 @@ create_ipset()
   [ "$NO_UPDATE" = "1" ] && return
  }
  ipset flush $2
- for f in "$5" "$6" ; do
-  ipset_restore "$f" "$2" $1
- done
+ [ "$DO_CLEAR" = "1" ] || {
+  for f in "$5" "$6" ; do
+   ipset_restore "$f" "$2" $1
+  done
+ }
  return 0
 }
 

diff --git a/uninstall_easy.sh b/uninstall_easy.sh
@@ -158,6 +158,9 @@ remove_openwrt_firewall()
 	openwrt_fw_section_del
 	# from old zapret versions. now we use single include
 	openwrt_fw_section_del 6
+
+	# free some RAM
+	"$EXEDIR/ipset/create_ipset.sh" clear
 }
 
 restart_openwrt_firewall()