summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-11-06 20:27:33 +0000
committerMike Frysinger <vapier@gentoo.org>2006-11-06 20:27:33 +0000
commit274cd9f93778cfe19701b45fd1201ba74d6e50b4 (patch)
treeaea207791126dc134ec9a7592cba42df6ac37c3e /net-firewall
parentMake 2.14.x dep on firefox 1.x only; bug #154163 (diff)
downloadgentoo-2-274cd9f93778cfe19701b45fd1201ba74d6e50b4.tar.gz
gentoo-2-274cd9f93778cfe19701b45fd1201ba74d6e50b4.tar.bz2
gentoo-2-274cd9f93778cfe19701b45fd1201ba74d6e50b4.zip
allow people to not flush firewall on stop #154269
(Portage version: 2.1.2_rc1-r3)
Diffstat (limited to 'net-firewall')
-rw-r--r--net-firewall/iptables/files/ip6tables-1.3.2.confd3
-rw-r--r--net-firewall/iptables/files/iptables-1.3.2.confd3
-rwxr-xr-xnet-firewall/iptables/files/iptables-1.3.2.init3
3 files changed, 8 insertions, 1 deletions
diff --git a/net-firewall/iptables/files/ip6tables-1.3.2.confd b/net-firewall/iptables/files/ip6tables-1.3.2.confd
index 93c0bc89b38a..7cd37285a209 100644
--- a/net-firewall/iptables/files/ip6tables-1.3.2.confd
+++ b/net-firewall/iptables/files/ip6tables-1.3.2.confd
@@ -9,3 +9,6 @@ SAVE_RESTORE_OPTIONS="-c"
# Save state on stopping iptables
SAVE_ON_STOP="yes"
+
+# Flush all rules and delete all chains on shutdown?
+CLEAR_ON_STOP="yes"
diff --git a/net-firewall/iptables/files/iptables-1.3.2.confd b/net-firewall/iptables/files/iptables-1.3.2.confd
index 91287debdbcf..83dd4c4fc2d6 100644
--- a/net-firewall/iptables/files/iptables-1.3.2.confd
+++ b/net-firewall/iptables/files/iptables-1.3.2.confd
@@ -9,3 +9,6 @@ SAVE_RESTORE_OPTIONS="-c"
# Save state on stopping iptables
SAVE_ON_STOP="yes"
+
+# Flush all rules and delete all chains on shutdown?
+CLEAR_ON_STOP="yes"
diff --git a/net-firewall/iptables/files/iptables-1.3.2.init b/net-firewall/iptables/files/iptables-1.3.2.init
index c8bf8da2a007..a21072f41454 100755
--- a/net-firewall/iptables/files/iptables-1.3.2.init
+++ b/net-firewall/iptables/files/iptables-1.3.2.init
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.3.2.init,v 1.2 2005/08/10 23:11:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.3.2.init,v 1.3 2006/11/06 20:27:33 vapier Exp $
opts="save reload panic"
@@ -65,6 +65,7 @@ stop() {
if [[ ${SAVE_ON_STOP} == "yes" ]] ; then
save || return 1
fi
+ [[ ${CLEAR_ON_STOP} != "yes" ]] && return 0
checkkernel || return 1
ebegin "Stopping firewall"
for a in $(<${iptables_proc}) ; do