public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Jason Donenfeld" <zx2c4@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/iptables/, net-firewall/iptables/files/systemd/
Date: Wed, 21 Feb 2018 15:06:23 +0000 (UTC)	[thread overview]
Message-ID: <1519225575.1dbbd48205516f3d2e14dad349c06f23b182de40.zx2c4@gentoo> (raw)

commit:     1dbbd48205516f3d2e14dad349c06f23b182de40
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 21 15:05:11 2018 +0000
Commit:     Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Wed Feb 21 15:06:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dbbd482

net-firewall/iptables: pass -w to ip*tables-restore in systemd units

Otherwise one restore rule will prevent the other from working, and
nothing will get restored.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-firewall/iptables/files/systemd/ip6tables-restore.service           | 2 +-
 net-firewall/iptables/files/systemd/iptables-restore.service            | 2 +-
 .../iptables/{iptables-1.4.21-r4.ebuild => iptables-1.4.21-r5.ebuild}   | 2 +-
 .../iptables/{iptables-1.6.1-r2.ebuild => iptables-1.6.1-r3.ebuild}     | 0
 .../iptables/{iptables-1.6.2.ebuild => iptables-1.6.2-r1.ebuild}        | 0
 5 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-firewall/iptables/files/systemd/ip6tables-restore.service b/net-firewall/iptables/files/systemd/ip6tables-restore.service
index c149e92ba90..921b691296d 100644
--- a/net-firewall/iptables/files/systemd/ip6tables-restore.service
+++ b/net-firewall/iptables/files/systemd/ip6tables-restore.service
@@ -8,7 +8,7 @@ Wants=network-pre.target
 
 [Service]
 Type=oneshot
-ExecStart=/sbin/ip6tables-restore /var/lib/ip6tables/rules-save
+ExecStart=/sbin/ip6tables-restore -w -- /var/lib/ip6tables/rules-save
 
 [Install]
 WantedBy=basic.target

diff --git a/net-firewall/iptables/files/systemd/iptables-restore.service b/net-firewall/iptables/files/systemd/iptables-restore.service
index 2474ee3ec41..a9e56793548 100644
--- a/net-firewall/iptables/files/systemd/iptables-restore.service
+++ b/net-firewall/iptables/files/systemd/iptables-restore.service
@@ -8,7 +8,7 @@ Wants=network-pre.target
 
 [Service]
 Type=oneshot
-ExecStart=/sbin/iptables-restore /var/lib/iptables/rules-save
+ExecStart=/sbin/iptables-restore -w -- /var/lib/iptables/rules-save
 
 [Install]
 WantedBy=basic.target

diff --git a/net-firewall/iptables/iptables-1.4.21-r4.ebuild b/net-firewall/iptables/iptables-1.4.21-r5.ebuild
similarity index 98%
rename from net-firewall/iptables/iptables-1.4.21-r4.ebuild
rename to net-firewall/iptables/iptables-1.4.21-r5.ebuild
index b873bc7ffcf..7861dad2a4f 100644
--- a/net-firewall/iptables/iptables-1.4.21-r4.ebuild
+++ b/net-firewall/iptables/iptables-1.4.21-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"

diff --git a/net-firewall/iptables/iptables-1.6.1-r2.ebuild b/net-firewall/iptables/iptables-1.6.1-r3.ebuild
similarity index 100%
rename from net-firewall/iptables/iptables-1.6.1-r2.ebuild
rename to net-firewall/iptables/iptables-1.6.1-r3.ebuild

diff --git a/net-firewall/iptables/iptables-1.6.2.ebuild b/net-firewall/iptables/iptables-1.6.2-r1.ebuild
similarity index 100%
rename from net-firewall/iptables/iptables-1.6.2.ebuild
rename to net-firewall/iptables/iptables-1.6.2-r1.ebuild


             reply	other threads:[~2018-02-21 15:06 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-21 15:06 Jason Donenfeld [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-05-09  9:33 [gentoo-commits] repo/gentoo:master commit in: net-firewall/iptables/, net-firewall/iptables/files/systemd/ David Seifert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1519225575.1dbbd48205516f3d2e14dad349c06f23b182de40.zx2c4@gentoo \
    --to=zx2c4@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox