Merge branch '4.6.8' of ssh://server.shorewall.net/home/teastep/shorewall/code into 4.6.8

Merge Tuomo Soini's fix for the .service files.
Delete questionable logic in lib.cli
2015-04-11 07:49:05 -07:00 · 2015-04-11 07:37:45 -07:00 · 2015-04-11 07:37:39 -07:00 · 2015-04-11 07:36:03 -07:00
10 changed files with 9 additions and 4 deletions
--- a/Shorewall-core/lib.cli
+++ b/Shorewall-core/lib.cli
@@ -4040,10 +4040,6 @@ shorewall_cli() {

    [ -n "${VARDIR:=/var/lib/$g_program}" ]

-    if [ ! -f ${VARDIR}/firewall ]; then
-	[ -f ${VARDIR}/.restore ] && cp -f ${VARDIR}/.rstore ${VARDIR}/firewall
-    fi
-
    g_firewall=${VARDIR}/firewall

    version_file=${g_sharedir}/version
--- 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
Author	SHA1	Message	Date
Tom Eastep	344697f96b	Merge branch '4.6.8' of ssh://server.shorewall.net/home/teastep/shorewall/code into 4.6.8 Merge Tuomo Soini's fix for the .service files.	2015-04-11 07:49:05 -07:00
Tom Eastep	3442117329	Delete questionable logic in lib.cli - It hasn't worked since there was a typo in it that prevented it from doing the correct thing. Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-04-11 07:37:45 -07:00
Tom Eastep	4595323f79	Correct typo in lib.cli Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-04-11 07:37:39 -07:00
Tuomo Soini	b33d847a54	systemd: fix shorewall startup by adding Wants=network-online.target Before shorewall failed to load if there were interfaces which were required but there wasn't any other service which wanted network-online.target. By adding Wants=network-online.target we make sure shorewall[6]* startup won't fail if there are required interfaces Signed-off-by: Tuomo Soini <tis@foobar.fi>	2015-04-11 07:36:03 -07:00