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.
2024-11-25 00:53:49 +01:00 · 2015-04-11 07:49:05 -07:00 · 2015-04-11 07:49:05 -07:00 · 344697f96b
commit 344697f96b
parent 77165326f2 3442117329
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