core129: Ship changes from ipsec branch

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/core/129/filelists/files b/config/rootfiles/core/129/filelists/files
index 168c7d188b168dbae0b0001b8a01b6abe242c563..093f43ff006deb3557551f97fa2796e4823f8d7b 100644 (file)
--- a/config/rootfiles/core/129/filelists/files
+++ b/config/rootfiles/core/129/filelists/files
@@ -1,3 +1,13 @@
 etc/system-release
 etc/issue
 var/ipfire/langs
+etc/rc.d/init.d/firewall
+etc/rc.d/init.d/network
+etc/rc.d/init.d/networking/red.up/50-ipsec
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/netovpnsrv.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
+usr/lib/firewall/firewall-lib.pl
+usr/lib/firewall/ipsec-policy
+usr/local/bin/ipsec-interfaces
+usr/local/bin/ipsecctrl

diff --git a/config/rootfiles/core/129/filelists/strongswan b/config/rootfiles/core/129/filelists/strongswan
new file mode 120000 (symlink)
index 0000000..90c727e
--- /dev/null
+++ b/config/rootfiles/core/129/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file

diff --git a/config/rootfiles/core/129/update.sh b/config/rootfiles/core/129/update.sh
index 5ce0cff05d60394ff0e9cadda325278c57b3910c..6d248cd02d429250d4c498991a8e81c57e6305b8 100644 (file)
--- a/config/rootfiles/core/129/update.sh
+++ b/config/rootfiles/core/129/update.sh
@@ -32,8 +32,11 @@ for (( i=1; i<=$core; i++ )); do
 done
 
 # Stop services
+/usr/local/bin/ipsecctrl D
 
 # Remove files
+rm -vf \
+       /usr/lib/firewall/ipsec-block
 
 # Extract files
 extract_files
@@ -45,6 +48,8 @@ ldconfig
 /usr/local/bin/update-lang-cache
 
 # Start services
+/etc/init.d/firewall restart
+/usr/local/bin/ipsecctrl S
 
 # This update needs a reboot...
 #touch /var/run/need_reboot