holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Merge branch '4.6.4'

Browse Source 
Conflicts:
	Shorewall-init/shorewall-init.service
This commit is contained in:
Tom Eastep 2014-10-08 18:26:42 -07:00
commit 4b9d8ad5f6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-init/shorewall-init.service
View File

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