| 1 |
commit: 1dbbd48205516f3d2e14dad349c06f23b182de40 |
| 2 |
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 21 15:05:11 2018 +0000 |
| 4 |
Commit: Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 21 15:06:15 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dbbd482 |
| 7 |
|
| 8 |
net-firewall/iptables: pass -w to ip*tables-restore in systemd units |
| 9 |
|
| 10 |
Otherwise one restore rule will prevent the other from working, and |
| 11 |
nothing will get restored. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 14 |
|
| 15 |
net-firewall/iptables/files/systemd/ip6tables-restore.service | 2 +- |
| 16 |
net-firewall/iptables/files/systemd/iptables-restore.service | 2 +- |
| 17 |
.../iptables/{iptables-1.4.21-r4.ebuild => iptables-1.4.21-r5.ebuild} | 2 +- |
| 18 |
.../iptables/{iptables-1.6.1-r2.ebuild => iptables-1.6.1-r3.ebuild} | 0 |
| 19 |
.../iptables/{iptables-1.6.2.ebuild => iptables-1.6.2-r1.ebuild} | 0 |
| 20 |
5 files changed, 3 insertions(+), 3 deletions(-) |
| 21 |
|
| 22 |
diff --git a/net-firewall/iptables/files/systemd/ip6tables-restore.service b/net-firewall/iptables/files/systemd/ip6tables-restore.service |
| 23 |
index c149e92ba90..921b691296d 100644 |
| 24 |
--- a/net-firewall/iptables/files/systemd/ip6tables-restore.service |
| 25 |
+++ b/net-firewall/iptables/files/systemd/ip6tables-restore.service |
| 26 |
@@ -8,7 +8,7 @@ Wants=network-pre.target |
| 27 |
|
| 28 |
[Service] |
| 29 |
Type=oneshot |
| 30 |
-ExecStart=/sbin/ip6tables-restore /var/lib/ip6tables/rules-save |
| 31 |
+ExecStart=/sbin/ip6tables-restore -w -- /var/lib/ip6tables/rules-save |
| 32 |
|
| 33 |
[Install] |
| 34 |
WantedBy=basic.target |
| 35 |
|
| 36 |
diff --git a/net-firewall/iptables/files/systemd/iptables-restore.service b/net-firewall/iptables/files/systemd/iptables-restore.service |
| 37 |
index 2474ee3ec41..a9e56793548 100644 |
| 38 |
--- a/net-firewall/iptables/files/systemd/iptables-restore.service |
| 39 |
+++ b/net-firewall/iptables/files/systemd/iptables-restore.service |
| 40 |
@@ -8,7 +8,7 @@ Wants=network-pre.target |
| 41 |
|
| 42 |
[Service] |
| 43 |
Type=oneshot |
| 44 |
-ExecStart=/sbin/iptables-restore /var/lib/iptables/rules-save |
| 45 |
+ExecStart=/sbin/iptables-restore -w -- /var/lib/iptables/rules-save |
| 46 |
|
| 47 |
[Install] |
| 48 |
WantedBy=basic.target |
| 49 |
|
| 50 |
diff --git a/net-firewall/iptables/iptables-1.4.21-r4.ebuild b/net-firewall/iptables/iptables-1.4.21-r5.ebuild |
| 51 |
similarity index 98% |
| 52 |
rename from net-firewall/iptables/iptables-1.4.21-r4.ebuild |
| 53 |
rename to net-firewall/iptables/iptables-1.4.21-r5.ebuild |
| 54 |
index b873bc7ffcf..7861dad2a4f 100644 |
| 55 |
--- a/net-firewall/iptables/iptables-1.4.21-r4.ebuild |
| 56 |
+++ b/net-firewall/iptables/iptables-1.4.21-r5.ebuild |
| 57 |
@@ -1,4 +1,4 @@ |
| 58 |
-# Copyright 1999-2014 Gentoo Foundation |
| 59 |
+# Copyright 1999-2018 Gentoo Foundation |
| 60 |
# Distributed under the terms of the GNU General Public License v2 |
| 61 |
|
| 62 |
EAPI="5" |
| 63 |
|
| 64 |
diff --git a/net-firewall/iptables/iptables-1.6.1-r2.ebuild b/net-firewall/iptables/iptables-1.6.1-r3.ebuild |
| 65 |
similarity index 100% |
| 66 |
rename from net-firewall/iptables/iptables-1.6.1-r2.ebuild |
| 67 |
rename to net-firewall/iptables/iptables-1.6.1-r3.ebuild |
| 68 |
|
| 69 |
diff --git a/net-firewall/iptables/iptables-1.6.2.ebuild b/net-firewall/iptables/iptables-1.6.2-r1.ebuild |
| 70 |
similarity index 100% |
| 71 |
rename from net-firewall/iptables/iptables-1.6.2.ebuild |
| 72 |
rename to net-firewall/iptables/iptables-1.6.2-r1.ebuild |
Archives