summaryrefslogtreecommitdiff
path: root/net-firewall/shorewall/files/shorewall-init-01_remove-ipset-functionality-r1.patch
blob: 8b7925d6dcebf39c948475e8a7b37579efbda6c0 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
diff -rupN old/shorewall-init-5.1.7/shorewall-init new/shorewall-init-5.1.7/shorewall-init
--- old/shorewall-init-5.1.7/shorewall-init	2017-09-18 18:28:43.000000000 +0200
+++ new/shorewall-init-5.1.7/shorewall-init	2017-09-23 15:46:03.489914459 +0200
@@ -80,10 +80,6 @@ shorewall_start () {
 	fi
     done
 
-    if [ -n "$SAVE_IPSETS" -a -f "$SAVE_IPSETS" ]; then
-	ipset -R < "$SAVE_IPSETS"
-    fi
-
     return 0
 }
 
@@ -101,15 +97,6 @@ shorewall_stop () {
 	fi
     done
 
-    if [ -n "$SAVE_IPSETS" ]; then
-	mkdir -p $(dirname "$SAVE_IPSETS")
-	if ipset -S > "${SAVE_IPSETS}.tmp"; then
-	    grep -qE -- '^(-N|create )' "${SAVE_IPSETS}.tmp" && mv -f "${SAVE_IPSETS}.tmp" "$SAVE_IPSETS" || rm -f "${SAVE_IPSETS}.tmp"
-	else
-	    rm -f "${SAVE_IPSETS}.tmp"
-	fi
-    fi
-
     return 0
 }