Delete 'conflicts=' from Shorewall-init .service files

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2015-08-17 06:40:36 -07:00
parent 12ebb491da
commit 4a484ced9e
4 changed files with 0 additions and 4 deletions

View File

@ -6,7 +6,6 @@
[Unit] [Unit]
Description=Shorewall firewall (bootup security) Description=Shorewall firewall (bootup security)
Before=network.target Before=network.target
Conflicts=iptables.service ip6tables.service firewalld.service
[Service] [Service]
Type=oneshot Type=oneshot

View File

@ -7,7 +7,6 @@
Description=Shorewall firewall (bootup security) Description=Shorewall firewall (bootup security)
Before=network-pre.target Before=network-pre.target
Wants=network-pre.target Wants=network-pre.target
Conflicts=iptables.service firewalld.service
[Service] [Service]
Type=oneshot Type=oneshot

View File

@ -7,7 +7,6 @@
Description=Shorewall firewall (bootup security) Description=Shorewall firewall (bootup security)
Before=network-pre.target Before=network-pre.target
Wants=network-pre.target Wants=network-pre.target
Conflicts=iptables.service firewalld.service
[Service] [Service]
Type=oneshot Type=oneshot

View File

@ -6,7 +6,6 @@
[Unit] [Unit]
Description=Shorewall firewall (bootup security) Description=Shorewall firewall (bootup security)
Before=network.target Before=network.target
Conflicts=iptables.service ip6tables.service firewalld.service
[Service] [Service]
Type=oneshot Type=oneshot