Attachment #369548 for bug #479490

View | Details | Raw Unified | Return to bug 479490
Collapse All | Expand All




[Unit]
Description=Restore ip6tables firewall rules
# if both are queued for some reason, don't store before restoring :)
Before=ip6tables-store.service
Conflicts=shutdown.target

[Service]
Type=oneshot
ExecStart=/sbin/ip6tables-restore /var/lib/ip6tables/rules-save

[Install]
WantedBy=basic.target

Line 0 Link Here

(-)a/net-firewall/iptables/files/systemd/ip6tables-store.service (+10 lines)
	1	[Unit]
	2	Description=Store ip6tables firewall rules
	3	Before=shutdown.target
	4
	5	[Service]
	6	Type=oneshot
	7	ExecStart=/bin/sh -c "/sbin/ip6tables-save --counters > /var/lib/ip6tables/rules-save"
	8
	9	[Install]
	10	WantedBy=shutdown.target




[Unit]
Description=Restore iptables firewall rules
# if both are queued for some reason, don't store before restoring :)
Before=iptables-store.service
Conflicts=shutdown.target

[Service]
Type=oneshot
ExecStart=/sbin/iptables-restore /var/lib/iptables/rules-save

[Install]
WantedBy=basic.target

Line 0 Link Here

(-)a/net-firewall/iptables/files/systemd/iptables-store.service (+10 lines)
	1	[Unit]
	2	Description=Store iptables firewall rules
	3	Before=shutdown.target
	4
	5	[Service]
	6	Type=oneshot
	7	ExecStart=/bin/sh -c "/sbin/iptables-save --counters > /var/lib/iptables/rules-save"
	8
	9	[Install]
	10	WantedBy=shutdown.target




# Force users doing their own patches to install their own tools
AUTOTOOLS_AUTO_DEPEND=no

inherit eutils multilib systemd toolchain-funcs autotools

DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
HOMEPAGE="http://www.netfilter.org/projects/iptables/"

		newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
	fi

	systemd_dounit "${FILESDIR}"/systemd/iptables-{re,}store.service
	systemd_enable_service shutdown.target iptables-store.service
	systemd_enable_service basic.target iptables-restore.service
	if use ipv6 ; then
		systemd_dounit "${FILESDIR}"/systemd/ip6tables-{re,}store.service
		systemd_enable_service shutdown.target ip6tables-store.service
		systemd_enable_service basic.target ip6tables-restore.service
	fi

	# Move important libs to /lib
	gen_usr_ldscript -a ip{4,6}tc iptc xtables

- 

Return to bug 479490

Line 0 Link Here

(-)a/net-firewall/iptables/files/systemd/ip6tables-restore.service (+12 lines)
	1	[Unit]
	2	Description=Restore ip6tables firewall rules
	3	# if both are queued for some reason, don't store before restoring :)
	4	Before=ip6tables-store.service
	5	Conflicts=shutdown.target
	6
	7	[Service]
	8	Type=oneshot
	9	ExecStart=/sbin/ip6tables-restore /var/lib/ip6tables/rules-save
	10
	11	[Install]
	12	WantedBy=basic.target

Line 0 Link Here

(-)a/net-firewall/iptables/files/systemd/iptables-restore.service (+12 lines)
	1	[Unit]
	2	Description=Restore iptables firewall rules
	3	# if both are queued for some reason, don't store before restoring :)
	4	Before=iptables-store.service
	5	Conflicts=shutdown.target
	6
	7	[Service]
	8	Type=oneshot
	9	ExecStart=/sbin/iptables-restore /var/lib/iptables/rules-save
	10
	11	[Install]
	12	WantedBy=basic.target

Lines 7-13 EAPI="5" Link Here

(-)a/net-firewall/iptables/iptables-1.4.21.ebuild (-2 / +10 lines)
7	# Force users doing their own patches to install their own tools	7	# Force users doing their own patches to install their own tools
8	AUTOTOOLS_AUTO_DEPEND=no	8	AUTOTOOLS_AUTO_DEPEND=no
9		9
10	inherit eutils multilib toolchain-funcs autotools	10	inherit eutils multilib systemd toolchain-funcs autotools
11		11
12	DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"	12	DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
13	HOMEPAGE="http://www.netfilter.org/projects/iptables/"	13	HOMEPAGE="http://www.netfilter.org/projects/iptables/"
Lines 80-85 src_install() { Link Here
80	newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables	80	newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
81	fi	81	fi
82		82
		83	systemd_dounit "${FILESDIR}"/systemd/iptables-{re,}store.service
		84	systemd_enable_service shutdown.target iptables-store.service
		85	systemd_enable_service basic.target iptables-restore.service
		86	if use ipv6 ; then
		87	systemd_dounit "${FILESDIR}"/systemd/ip6tables-{re,}store.service
		88	systemd_enable_service shutdown.target ip6tables-store.service
		89	systemd_enable_service basic.target ip6tables-restore.service
		90	fi
		91
83	# Move important libs to /lib	92	# Move important libs to /lib
84	gen_usr_ldscript -a ip{4,6}tc iptc xtables	93	gen_usr_ldscript -a ip{4,6}tc iptc xtables
85		94
86	-