From 8e9d769723d32fea93ae9a39267720c543682051 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Wed, 8 Oct 2014 18:24:53 -0700
Subject: [PATCH] Add iptables.service to Shorewall-init conflicts

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall-init/shorewall-init.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Shorewall-init/shorewall-init.service b/Shorewall-init/shorewall-init.service
index 01d1b8480..51ccf5357 100644
--- a/Shorewall-init/shorewall-init.service
+++ b/Shorewall-init/shorewall-init.service
@@ -7,7 +7,7 @@
 Description=Shorewall IPv4 firewall (bootup security)
 Before=network-pre.target
 Wants=network-pre.target
-Conflicts=firewalld.service
+Conflicts=iptables.service firewalld.service
 
 [Service]
 Type=oneshot