From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 25 Oct 2021 16:52:15 +0000 (+0000)
Subject: core161: add strongswan changes to update.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c04ebdccee35ddac7cc483efb182982f7345052f;p=people%2Fms%2Fipfire-2.x.git

core161: add strongswan changes to update.

this core also stops strongwan before extracting because the updown script
is changed.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/rootfiles/core/161/filelists/files b/config/rootfiles/core/161/filelists/files
index 544b08d17e..3d0a9d1bdd 100644
--- a/config/rootfiles/core/161/filelists/files
+++ b/config/rootfiles/core/161/filelists/files
@@ -14,7 +14,6 @@ srv/web/ipfire/cgi-bin/speed.cgi
 usr/bin/2to3
 usr/bin/hexdump
 usr/lib/firewall/rules.pl
-usr/libexec/ipsec/_updown
 usr/local/bin/hddshutdown
 usr/local/bin/makegraphs
 var/ipfire/backup/exclude
diff --git a/config/rootfiles/core/161/filelists/stronswan b/config/rootfiles/core/161/filelists/stronswan
new file mode 120000
index 0000000000..90c727e265
--- /dev/null
+++ b/config/rootfiles/core/161/filelists/stronswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/161/update.sh b/config/rootfiles/core/161/update.sh
index 8899508244..db0dc1e98a 100644
--- a/config/rootfiles/core/161/update.sh
+++ b/config/rootfiles/core/161/update.sh
@@ -96,6 +96,7 @@ rm -rf /usr/lib/python2*
 rm -rf /usr/lib/collectd/python.so
 
 # Stop services
+/etc/init.d/ipsec stop
 
 # Extract files
 extract_files
@@ -119,6 +120,9 @@ ldconfig
 /usr/local/bin/filesystem-cleanup
 
 # Start services
+if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
+	/etc/init.d/ipsec start
+fi
 
 # Delete orphaned pppd 2.4.8 shared object files
 rm -rf \
@@ -162,3 +166,4 @@ sync
 
 # Don't report the exitcode last command
 exit 0
+# Stop services