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 544b08d17ec970e181837d6afd0a01096c423f8d..3d0a9d1bddbfd964f9a6c07fbc317034cc8a0f75 100644 (file)
--- 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 (symlink)
index 0000000..90c727e
--- /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 88995082449b306abf7f7dc68817f0a8248a1b84..db0dc1e98a16aa4571efc17664f3222614b86b8e 100644 (file)
--- 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