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

Get Tuomo Soini's fix for serviced startup
This commit is contained in:
Tom Eastep 2015-04-11 07:33:15 -07:00
commit b128c30813
9 changed files with 9 additions and 0 deletions

View File

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

View File

@ -5,6 +5,7 @@
# #
[Unit] [Unit]
Description=Shorewall IPv4 firewall (lite) Description=Shorewall IPv4 firewall (lite)
Wants=network-online.target
After=network-online.target After=network-online.target
Conflicts=iptables.service firewalld.service Conflicts=iptables.service firewalld.service

View File

@ -5,6 +5,7 @@
# #
[Unit] [Unit]
Description=Shorewall IPv4 firewall (lite) Description=Shorewall IPv4 firewall (lite)
Wants=network-online.target
After=network-online.target After=network-online.target
Conflicts=iptables.service firewalld.service Conflicts=iptables.service firewalld.service

View File

@ -5,6 +5,7 @@
# #
[Unit] [Unit]
Description=Shorewall IPv4 firewall Description=Shorewall IPv4 firewall
Wants=network-online.target
After=network-online.target After=network-online.target
Conflicts=iptables.service firewalld.service Conflicts=iptables.service firewalld.service

View File

@ -5,6 +5,7 @@
# #
[Unit] [Unit]
Description=Shorewall IPv4 firewall Description=Shorewall IPv4 firewall
Wants=network-online.target
After=network-online.target After=network-online.target
Conflicts=iptables.service firewalld.service Conflicts=iptables.service firewalld.service

View File

@ -5,6 +5,7 @@
# #
[Unit] [Unit]
Description=Shorewall IPv6 firewall (lite) Description=Shorewall IPv6 firewall (lite)
Wants=network-online.target
After=network-online.target After=network-online.target
Conflicts=ip6tables.service firewalld.service Conflicts=ip6tables.service firewalld.service

View File

@ -5,6 +5,7 @@
# #
[Unit] [Unit]
Description=Shorewall IPv6 firewall (lite) Description=Shorewall IPv6 firewall (lite)
Wants=network-online.target
After=network-online.target After=network-online.target
Conflicts=ip6tables.service firewalld.service Conflicts=ip6tables.service firewalld.service

View File

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

View File

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