[gentoo-commits] repo/gentoo:master commit in: net-firewall/iptables/files/systemd/

2016-10-23 Thread Mike Gilbert 
commit: 0cfab3ee206cb4edae48ded9bb5b63a7eab8fbc2
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Oct 23 19:06:27 2016 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Oct 23 19:07:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cfab3ee

net-firewall/iptables: adjust systemd service deps

Package-Manager: portage-2.3.2

 net-firewall/iptables/files/systemd/ip6tables-restore.service | 4 ++--
 net-firewall/iptables/files/systemd/iptables-restore.service  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-firewall/iptables/files/systemd/ip6tables-restore.service 
b/net-firewall/iptables/files/systemd/ip6tables-restore.service
index 88415fa..c149e92 100644
--- a/net-firewall/iptables/files/systemd/ip6tables-restore.service
+++ b/net-firewall/iptables/files/systemd/ip6tables-restore.service
@@ -3,8 +3,8 @@ Description=Restore ip6tables firewall rules
 # if both are queued for some reason, don't store before restoring :)
 Before=ip6tables-store.service
 # sounds reasonable to have firewall up before any of the services go up
-Before=network.target
-Conflicts=shutdown.target
+Before=network-pre.target
+Wants=network-pre.target
 
 [Service]
 Type=oneshot

diff --git a/net-firewall/iptables/files/systemd/iptables-restore.service 
b/net-firewall/iptables/files/systemd/iptables-restore.service
index 9d568d7..2474ee3 100644
--- a/net-firewall/iptables/files/systemd/iptables-restore.service
+++ b/net-firewall/iptables/files/systemd/iptables-restore.service
@@ -3,8 +3,8 @@ Description=Restore iptables firewall rules
 # if both are queued for some reason, don't store before restoring :)
 Before=iptables-store.service
 # sounds reasonable to have firewall up before any of the services go up
-Before=network.target
-Conflicts=shutdown.target
+Before=network-pre.target
+Wants=network-pre.target
 
 [Service]
 Type=oneshot

[gentoo-commits] repo/gentoo:master commit in: net-firewall/iptables/files/systemd/

2016-10-23 Thread Mike Gilbert 
commit: 0cfab3ee206cb4edae48ded9bb5b63a7eab8fbc2
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Oct 23 19:06:27 2016 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Oct 23 19:07:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cfab3ee

net-firewall/iptables: adjust systemd service deps

Package-Manager: portage-2.3.2

 net-firewall/iptables/files/systemd/ip6tables-restore.service | 4 ++--
 net-firewall/iptables/files/systemd/iptables-restore.service  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-firewall/iptables/files/systemd/ip6tables-restore.service 
b/net-firewall/iptables/files/systemd/ip6tables-restore.service
index 88415fa..c149e92 100644
--- a/net-firewall/iptables/files/systemd/ip6tables-restore.service
+++ b/net-firewall/iptables/files/systemd/ip6tables-restore.service
@@ -3,8 +3,8 @@ Description=Restore ip6tables firewall rules
 # if both are queued for some reason, don't store before restoring :)
 Before=ip6tables-store.service
 # sounds reasonable to have firewall up before any of the services go up
-Before=network.target
-Conflicts=shutdown.target
+Before=network-pre.target
+Wants=network-pre.target
 
 [Service]
 Type=oneshot

diff --git a/net-firewall/iptables/files/systemd/iptables-restore.service 
b/net-firewall/iptables/files/systemd/iptables-restore.service
index 9d568d7..2474ee3 100644
--- a/net-firewall/iptables/files/systemd/iptables-restore.service
+++ b/net-firewall/iptables/files/systemd/iptables-restore.service
@@ -3,8 +3,8 @@ Description=Restore iptables firewall rules
 # if both are queued for some reason, don't store before restoring :)
 Before=iptables-store.service
 # sounds reasonable to have firewall up before any of the services go up
-Before=network.target
-Conflicts=shutdown.target
+Before=network-pre.target
+Wants=network-pre.target
 
 [Service]
 Type=oneshot

[gentoo-commits] repo/gentoo:master commit in: net-firewall/iptables/files/systemd/

2016-10-23 Thread Mike Gilbert 
commit: 0cfab3ee206cb4edae48ded9bb5b63a7eab8fbc2
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Oct 23 19:06:27 2016 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Oct 23 19:07:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cfab3ee

net-firewall/iptables: adjust systemd service deps

Package-Manager: portage-2.3.2

 net-firewall/iptables/files/systemd/ip6tables-restore.service | 4 ++--
 net-firewall/iptables/files/systemd/iptables-restore.service  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-firewall/iptables/files/systemd/ip6tables-restore.service 
b/net-firewall/iptables/files/systemd/ip6tables-restore.service
index 88415fa..c149e92 100644
--- a/net-firewall/iptables/files/systemd/ip6tables-restore.service
+++ b/net-firewall/iptables/files/systemd/ip6tables-restore.service
@@ -3,8 +3,8 @@ Description=Restore ip6tables firewall rules
 # if both are queued for some reason, don't store before restoring :)
 Before=ip6tables-store.service
 # sounds reasonable to have firewall up before any of the services go up
-Before=network.target
-Conflicts=shutdown.target
+Before=network-pre.target
+Wants=network-pre.target
 
 [Service]
 Type=oneshot

diff --git a/net-firewall/iptables/files/systemd/iptables-restore.service 
b/net-firewall/iptables/files/systemd/iptables-restore.service
index 9d568d7..2474ee3 100644
--- a/net-firewall/iptables/files/systemd/iptables-restore.service
+++ b/net-firewall/iptables/files/systemd/iptables-restore.service
@@ -3,8 +3,8 @@ Description=Restore iptables firewall rules
 # if both are queued for some reason, don't store before restoring :)
 Before=iptables-store.service
 # sounds reasonable to have firewall up before any of the services go up
-Before=network.target
-Conflicts=shutdown.target
+Before=network-pre.target
+Wants=network-pre.target
 
 [Service]
 Type=oneshot

[gentoo-commits] repo/gentoo:master commit in: net-firewall/iptables/files/systemd/

2016-10-23 Thread Mike Gilbert 
commit: 0cfab3ee206cb4edae48ded9bb5b63a7eab8fbc2
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Oct 23 19:06:27 2016 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Oct 23 19:07:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cfab3ee

net-firewall/iptables: adjust systemd service deps

Package-Manager: portage-2.3.2

 net-firewall/iptables/files/systemd/ip6tables-restore.service | 4 ++--
 net-firewall/iptables/files/systemd/iptables-restore.service  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-firewall/iptables/files/systemd/ip6tables-restore.service 
b/net-firewall/iptables/files/systemd/ip6tables-restore.service
index 88415fa..c149e92 100644
--- a/net-firewall/iptables/files/systemd/ip6tables-restore.service
+++ b/net-firewall/iptables/files/systemd/ip6tables-restore.service
@@ -3,8 +3,8 @@ Description=Restore ip6tables firewall rules
 # if both are queued for some reason, don't store before restoring :)
 Before=ip6tables-store.service
 # sounds reasonable to have firewall up before any of the services go up
-Before=network.target
-Conflicts=shutdown.target
+Before=network-pre.target
+Wants=network-pre.target
 
 [Service]
 Type=oneshot

diff --git a/net-firewall/iptables/files/systemd/iptables-restore.service 
b/net-firewall/iptables/files/systemd/iptables-restore.service
index 9d568d7..2474ee3 100644
--- a/net-firewall/iptables/files/systemd/iptables-restore.service
+++ b/net-firewall/iptables/files/systemd/iptables-restore.service
@@ -3,8 +3,8 @@ Description=Restore iptables firewall rules
 # if both are queued for some reason, don't store before restoring :)
 Before=iptables-store.service
 # sounds reasonable to have firewall up before any of the services go up
-Before=network.target
-Conflicts=shutdown.target
+Before=network-pre.target
+Wants=network-pre.target
 
 [Service]
 Type=oneshot

[gentoo-commits] repo/gentoo:master commit in: net-firewall/iptables/files/systemd/

2016-10-23 Thread Mike Gilbert 
commit: 0cfab3ee206cb4edae48ded9bb5b63a7eab8fbc2
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Oct 23 19:06:27 2016 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Oct 23 19:07:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cfab3ee

net-firewall/iptables: adjust systemd service deps

Package-Manager: portage-2.3.2

 net-firewall/iptables/files/systemd/ip6tables-restore.service | 4 ++--
 net-firewall/iptables/files/systemd/iptables-restore.service  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-firewall/iptables/files/systemd/ip6tables-restore.service 
b/net-firewall/iptables/files/systemd/ip6tables-restore.service
index 88415fa..c149e92 100644
--- a/net-firewall/iptables/files/systemd/ip6tables-restore.service
+++ b/net-firewall/iptables/files/systemd/ip6tables-restore.service
@@ -3,8 +3,8 @@ Description=Restore ip6tables firewall rules
 # if both are queued for some reason, don't store before restoring :)
 Before=ip6tables-store.service
 # sounds reasonable to have firewall up before any of the services go up
-Before=network.target
-Conflicts=shutdown.target
+Before=network-pre.target
+Wants=network-pre.target
 
 [Service]
 Type=oneshot

diff --git a/net-firewall/iptables/files/systemd/iptables-restore.service 
b/net-firewall/iptables/files/systemd/iptables-restore.service
index 9d568d7..2474ee3 100644
--- a/net-firewall/iptables/files/systemd/iptables-restore.service
+++ b/net-firewall/iptables/files/systemd/iptables-restore.service
@@ -3,8 +3,8 @@ Description=Restore iptables firewall rules
 # if both are queued for some reason, don't store before restoring :)
 Before=iptables-store.service
 # sounds reasonable to have firewall up before any of the services go up
-Before=network.target
-Conflicts=shutdown.target
+Before=network-pre.target
+Wants=network-pre.target
 
 [Service]
 Type=oneshot

[gentoo-commits] repo/gentoo:master commit in: net-firewall/iptables/files/systemd/

2016-10-23 Thread Mike Gilbert 
commit: 0cfab3ee206cb4edae48ded9bb5b63a7eab8fbc2
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Oct 23 19:06:27 2016 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Oct 23 19:07:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cfab3ee

net-firewall/iptables: adjust systemd service deps

Package-Manager: portage-2.3.2

 net-firewall/iptables/files/systemd/ip6tables-restore.service | 4 ++--
 net-firewall/iptables/files/systemd/iptables-restore.service  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-firewall/iptables/files/systemd/ip6tables-restore.service 
b/net-firewall/iptables/files/systemd/ip6tables-restore.service
index 88415fa..c149e92 100644
--- a/net-firewall/iptables/files/systemd/ip6tables-restore.service
+++ b/net-firewall/iptables/files/systemd/ip6tables-restore.service
@@ -3,8 +3,8 @@ Description=Restore ip6tables firewall rules
 # if both are queued for some reason, don't store before restoring :)
 Before=ip6tables-store.service
 # sounds reasonable to have firewall up before any of the services go up
-Before=network.target
-Conflicts=shutdown.target
+Before=network-pre.target
+Wants=network-pre.target
 
 [Service]
 Type=oneshot

diff --git a/net-firewall/iptables/files/systemd/iptables-restore.service 
b/net-firewall/iptables/files/systemd/iptables-restore.service
index 9d568d7..2474ee3 100644
--- a/net-firewall/iptables/files/systemd/iptables-restore.service
+++ b/net-firewall/iptables/files/systemd/iptables-restore.service
@@ -3,8 +3,8 @@ Description=Restore iptables firewall rules
 # if both are queued for some reason, don't store before restoring :)
 Before=iptables-store.service
 # sounds reasonable to have firewall up before any of the services go up
-Before=network.target
-Conflicts=shutdown.target
+Before=network-pre.target
+Wants=network-pre.target
 
 [Service]
 Type=oneshot

[gentoo-commits] repo/gentoo:master commit in: net-firewall/iptables/files/systemd/

2016-10-23 Thread Mike Gilbert 
commit: 0cfab3ee206cb4edae48ded9bb5b63a7eab8fbc2
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Oct 23 19:06:27 2016 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Oct 23 19:07:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cfab3ee

net-firewall/iptables: adjust systemd service deps

Package-Manager: portage-2.3.2

 net-firewall/iptables/files/systemd/ip6tables-restore.service | 4 ++--
 net-firewall/iptables/files/systemd/iptables-restore.service  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-firewall/iptables/files/systemd/ip6tables-restore.service 
b/net-firewall/iptables/files/systemd/ip6tables-restore.service
index 88415fa..c149e92 100644
--- a/net-firewall/iptables/files/systemd/ip6tables-restore.service
+++ b/net-firewall/iptables/files/systemd/ip6tables-restore.service
@@ -3,8 +3,8 @@ Description=Restore ip6tables firewall rules
 # if both are queued for some reason, don't store before restoring :)
 Before=ip6tables-store.service
 # sounds reasonable to have firewall up before any of the services go up
-Before=network.target
-Conflicts=shutdown.target
+Before=network-pre.target
+Wants=network-pre.target
 
 [Service]
 Type=oneshot

diff --git a/net-firewall/iptables/files/systemd/iptables-restore.service 
b/net-firewall/iptables/files/systemd/iptables-restore.service
index 9d568d7..2474ee3 100644
--- a/net-firewall/iptables/files/systemd/iptables-restore.service
+++ b/net-firewall/iptables/files/systemd/iptables-restore.service
@@ -3,8 +3,8 @@ Description=Restore iptables firewall rules
 # if both are queued for some reason, don't store before restoring :)
 Before=iptables-store.service
 # sounds reasonable to have firewall up before any of the services go up
-Before=network.target
-Conflicts=shutdown.target
+Before=network-pre.target
+Wants=network-pre.target
 
 [Service]
 Type=oneshot

[gentoo-commits] repo/gentoo:master commit in: net-firewall/iptables/files/systemd/

2016-10-23 Thread Mike Gilbert 
commit: 0cfab3ee206cb4edae48ded9bb5b63a7eab8fbc2
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Oct 23 19:06:27 2016 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Oct 23 19:07:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cfab3ee

net-firewall/iptables: adjust systemd service deps

Package-Manager: portage-2.3.2

 net-firewall/iptables/files/systemd/ip6tables-restore.service | 4 ++--
 net-firewall/iptables/files/systemd/iptables-restore.service  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-firewall/iptables/files/systemd/ip6tables-restore.service 
b/net-firewall/iptables/files/systemd/ip6tables-restore.service
index 88415fa..c149e92 100644
--- a/net-firewall/iptables/files/systemd/ip6tables-restore.service
+++ b/net-firewall/iptables/files/systemd/ip6tables-restore.service
@@ -3,8 +3,8 @@ Description=Restore ip6tables firewall rules
 # if both are queued for some reason, don't store before restoring :)
 Before=ip6tables-store.service
 # sounds reasonable to have firewall up before any of the services go up
-Before=network.target
-Conflicts=shutdown.target
+Before=network-pre.target
+Wants=network-pre.target
 
 [Service]
 Type=oneshot

diff --git a/net-firewall/iptables/files/systemd/iptables-restore.service 
b/net-firewall/iptables/files/systemd/iptables-restore.service
index 9d568d7..2474ee3 100644
--- a/net-firewall/iptables/files/systemd/iptables-restore.service
+++ b/net-firewall/iptables/files/systemd/iptables-restore.service
@@ -3,8 +3,8 @@ Description=Restore iptables firewall rules
 # if both are queued for some reason, don't store before restoring :)
 Before=iptables-store.service
 # sounds reasonable to have firewall up before any of the services go up
-Before=network.target
-Conflicts=shutdown.target
+Before=network-pre.target
+Wants=network-pre.target
 
 [Service]
 Type=oneshot