From 3b1ad1e284f6d81d30566b69b07b49e5f6febf50 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Mon, 17 Aug 2015 06:40:36 -0700
Subject: [PATCH] Delete 'conflicts=' from Shorewall-init .service files

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall-init/shorewall-init.service            | 1 -
 Shorewall-init/shorewall-init.service.214        | 1 -
 Shorewall-init/shorewall-init.service.214.debian | 1 -
 Shorewall-init/shorewall-init.service.debian     | 1 -
 4 files changed, 4 deletions(-)

diff --git a/Shorewall-init/shorewall-init.service b/Shorewall-init/shorewall-init.service
index 6842aa531..d64562763 100644
--- a/Shorewall-init/shorewall-init.service
+++ b/Shorewall-init/shorewall-init.service
@@ -6,7 +6,6 @@
 [Unit]
 Description=Shorewall firewall (bootup security)
 Before=network.target
-Conflicts=iptables.service ip6tables.service firewalld.service
 
 [Service]
 Type=oneshot
diff --git a/Shorewall-init/shorewall-init.service.214 b/Shorewall-init/shorewall-init.service.214
index 5c86e99e9..01cf13f93 100644
--- a/Shorewall-init/shorewall-init.service.214
+++ b/Shorewall-init/shorewall-init.service.214
@@ -7,7 +7,6 @@
 Description=Shorewall firewall (bootup security)
 Before=network-pre.target
 Wants=network-pre.target
-Conflicts=iptables.service firewalld.service
 
 [Service]
 Type=oneshot
diff --git a/Shorewall-init/shorewall-init.service.214.debian b/Shorewall-init/shorewall-init.service.214.debian
index a292e97a7..cf2b14381 100644
--- a/Shorewall-init/shorewall-init.service.214.debian
+++ b/Shorewall-init/shorewall-init.service.214.debian
@@ -8,7 +8,6 @@
 Description=Shorewall firewall (bootup security)
 Before=network-pre.target
 Wants=network-pre.target
-Conflicts=iptables.service firewalld.service
 
 [Service]
 Type=oneshot
diff --git a/Shorewall-init/shorewall-init.service.debian b/Shorewall-init/shorewall-init.service.debian
index efd55e286..5ce68bcc7 100644
--- a/Shorewall-init/shorewall-init.service.debian
+++ b/Shorewall-init/shorewall-init.service.debian
@@ -7,7 +7,6 @@
 [Unit]
 Description=Shorewall firewall (bootup security)
 Before=network.target
-Conflicts=iptables.service ip6tables.service firewalld.service
 
 [Service]
 Type=oneshot