Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code

This commit is contained in:
Tom Eastep 2015-04-12 07:52:34 -07:00
commit 057ad45fd9
2 changed files with 1 additions and 2 deletions

View File

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

View File

@ -5,8 +5,8 @@
#
[Unit]
Description=Shorewall IPv6 firewall
After=network-online.target
Wants=network-online.target
After=network-online.target
Conflicts=ip6tables.service firewalld.service
[Service]