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

Get Tuomo Soini's fix for serviced startup
2015-04-11 07:33:15 -07:00 · 2015-04-11 07:33:15 -07:00 · b128c30813
commit b128c30813
parent 3cb45f234e 194252afd3
9 changed files with 9 additions and 0 deletions
--- a/Shorewall-init/shorewall-init.service
+++ b/Shorewall-init/shorewall-init.service
@ -6,6 +6,7 @@
 [Unit]
 Description=Shorewall IPv4 firewall (bootup security)
 Before=network.target
+Wants=network.target
 Conflicts=iptables.service firewalld.service

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

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

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

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

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

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

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

 [Service]
--- a/Shorewall6/shorewall6.service.214
+++ b/Shorewall6/shorewall6.service.214
@ -5,6 +5,7 @@
 #
 [Unit]
 Description=Shorewall IPv6 firewall
+Wants=network-online.target
 After=network-online.target
 Conflicts=ip6tables.service firewalld.service