diff --git a/Shorewall-init/shorewall-init.service b/Shorewall-init/shorewall-init.service index e4b30b183..57252241f 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 bcf363cae..466a788eb 100644 --- a/Shorewall-init/shorewall-init.service.214.debian +++ b/Shorewall-init/shorewall-init.service.214.debian @@ -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.debian b/Shorewall-init/shorewall-init.service.debian index 286825223..f94ad64e6 100644 --- a/Shorewall-init/shorewall-init.service.debian +++ b/Shorewall-init/shorewall-init.service.debian @@ -6,7 +6,6 @@ [Unit] Description=Shorewall firewall (bootup security) Before=network.target -Conflicts=iptables.service ip6tables.service firewalld.service [Service] Type=oneshot