* [gentoo-commits] gentoo-x86 commit in net-firewall/iptables/files: iptables-1.4.13-r1.init
@ 2012-09-14 17:58 Ian Stakenvicius (axs)
0 siblings, 0 replies; 3+ messages in thread
From: Ian Stakenvicius (axs) @ 2012-09-14 17:58 UTC (permalink / raw
To: gentoo-commits
axs 12/09/14 17:58:26
Added: iptables-1.4.13-r1.init
Log:
fixed init script to ensure rules save path will always exist on save
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Revision Changes Path
1.1 net-firewall/iptables/files/iptables-1.4.13-r1.init
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/files/iptables-1.4.13-r1.init?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/files/iptables-1.4.13-r1.init?rev=1.1&content-type=text/plain
Index: iptables-1.4.13-r1.init
===================================================================
#!/sbin/runscript
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.4.13-r1.init,v 1.1 2012/09/14 17:58:26 axs Exp $
extra_commands="save panic"
extra_started_commands="reload"
iptables_name=${SVCNAME}
if [ "${iptables_name}" != "iptables" -a "${iptables_name}" != "ip6tables" ] ; then
iptables_name="iptables"
fi
iptables_bin="/sbin/${iptables_name}"
case ${iptables_name} in
iptables) iptables_proc="/proc/net/ip_tables_names"
iptables_save=${IPTABLES_SAVE};;
ip6tables) iptables_proc="/proc/net/ip6_tables_names"
iptables_save=${IP6TABLES_SAVE};;
esac
depend() {
before net
}
set_table_policy() {
local chains table=$1 policy=$2
case ${table} in
nat) chains="PREROUTING POSTROUTING OUTPUT";;
mangle) chains="PREROUTING INPUT FORWARD OUTPUT POSTROUTING";;
filter) chains="INPUT FORWARD OUTPUT";;
*) chains="";;
esac
local chain
for chain in ${chains} ; do
${iptables_bin} -t ${table} -P ${chain} ${policy}
done
}
checkkernel() {
if [ ! -e ${iptables_proc} ] ; then
eerror "Your kernel lacks ${iptables_name} support, please load"
eerror "appropriate modules and try again."
return 1
fi
return 0
}
checkconfig() {
if [ ! -f ${iptables_save} ] ; then
eerror "Not starting ${iptables_name}. First create some rules then run:"
eerror "/etc/init.d/${iptables_name} save"
return 1
fi
return 0
}
start() {
checkconfig || return 1
ebegin "Loading ${iptables_name} state and starting firewall"
${iptables_bin}-restore ${SAVE_RESTORE_OPTIONS} < "${iptables_save}"
eend $?
}
stop() {
if [ "${SAVE_ON_STOP}" = "yes" ] ; then
save || return 1
fi
checkkernel || return 1
ebegin "Stopping firewall"
local a
for a in $(cat ${iptables_proc}) ; do
set_table_policy $a ACCEPT
${iptables_bin} -F -t $a
${iptables_bin} -X -t $a
done
eend $?
}
reload() {
checkkernel || return 1
ebegin "Flushing firewall"
local a
for a in $(cat ${iptables_proc}) ; do
${iptables_bin} -F -t $a
${iptables_bin} -X -t $a
done
eend $?
start
}
save() {
ebegin "Saving ${iptables_name} state"
checkpath -q -d "$(dirname "${iptables_save}")"
checkpath -q -m 0600 -f "${iptables_save}"
${iptables_bin}-save ${SAVE_RESTORE_OPTIONS} > "${iptables_save}"
eend $?
}
panic() {
checkkernel || return 1
if service_started ${iptables_name}; then
rc-service ${iptables_name} stop
fi
local a
ebegin "Dropping all packets"
for a in $(cat ${iptables_proc}) ; do
${iptables_bin} -F -t $a
${iptables_bin} -X -t $a
set_table_policy $a DROP
done
eend $?
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-firewall/iptables/files: iptables-1.4.13-r1.init
@ 2013-04-27 9:42 Mike Frysinger (vapier)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2013-04-27 9:42 UTC (permalink / raw
To: gentoo-commits
vapier 13/04/27 09:42:43
Modified: iptables-1.4.13-r1.init
Log:
Have init.d depend on localmount for /var state #434774 by Marc Schiffbauer.
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Revision Changes Path
1.2 net-firewall/iptables/files/iptables-1.4.13-r1.init
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/files/iptables-1.4.13-r1.init?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/files/iptables-1.4.13-r1.init?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/files/iptables-1.4.13-r1.init?r1=1.1&r2=1.2
Index: iptables-1.4.13-r1.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.4.13-r1.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iptables-1.4.13-r1.init 14 Sep 2012 17:58:26 -0000 1.1
+++ iptables-1.4.13-r1.init 27 Apr 2013 09:42:43 -0000 1.2
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.4.13-r1.init,v 1.1 2012/09/14 17:58:26 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.4.13-r1.init,v 1.2 2013/04/27 09:42:43 vapier Exp $
extra_commands="save panic"
extra_started_commands="reload"
@@ -20,6 +20,7 @@
esac
depend() {
+ need localmount #434774
before net
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-firewall/iptables/files: iptables-1.4.13-r1.init
@ 2013-04-27 17:29 Mike Frysinger (vapier)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2013-04-27 17:29 UTC (permalink / raw
To: gentoo-commits
vapier 13/04/27 17:29:09
Modified: iptables-1.4.13-r1.init
Log:
Add a "check" option and use it before reloading in case the rules are broken somehow #198907#10 by David K. Thompson.
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Revision Changes Path
1.3 net-firewall/iptables/files/iptables-1.4.13-r1.init
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/files/iptables-1.4.13-r1.init?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/files/iptables-1.4.13-r1.init?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/files/iptables-1.4.13-r1.init?r1=1.2&r2=1.3
Index: iptables-1.4.13-r1.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.4.13-r1.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- iptables-1.4.13-r1.init 27 Apr 2013 09:42:43 -0000 1.2
+++ iptables-1.4.13-r1.init 27 Apr 2013 17:29:09 -0000 1.3
@@ -1,15 +1,16 @@
#!/sbin/runscript
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.4.13-r1.init,v 1.2 2013/04/27 09:42:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.4.13-r1.init,v 1.3 2013/04/27 17:29:09 vapier Exp $
-extra_commands="save panic"
+extra_commands="check save panic"
extra_started_commands="reload"
iptables_name=${SVCNAME}
-if [ "${iptables_name}" != "iptables" -a "${iptables_name}" != "ip6tables" ] ; then
- iptables_name="iptables"
-fi
+case ${iptables_name} in
+iptables|ip6tables) ;;
+*) iptables_name="iptables" ;;
+esac
iptables_bin="/sbin/${iptables_name}"
case ${iptables_name} in
@@ -80,6 +81,7 @@
reload() {
checkkernel || return 1
+ checkrules || return 1
ebegin "Flushing firewall"
local a
for a in $(cat ${iptables_proc}) ; do
@@ -91,6 +93,17 @@
start
}
+checkrules() {
+ ebegin "Checking rules"
+ ${iptables_bin}-restore --test ${SAVE_RESTORE_OPTIONS} < "${iptables_save}"
+ eend $?
+}
+
+check() {
+ # Short name for users of init.d script.
+ checkrules
+}
+
save() {
ebegin "Saving ${iptables_name} state"
checkpath -q -d "$(dirname "${iptables_save}")"
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-04-27 17:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-27 9:42 [gentoo-commits] gentoo-x86 commit in net-firewall/iptables/files: iptables-1.4.13-r1.init Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2013-04-27 17:29 Mike Frysinger (vapier)
2012-09-14 17:58 Ian Stakenvicius (axs)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox