From 59db01c753d0a6240ccfd10e3561e88958fc1da0 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 25 Feb 2019 00:55:31 +0000 Subject: [PATCH] core129: Ship changes from ipsec branch Signed-off-by: Michael Tremer --- config/rootfiles/core/129/filelists/files | 10 ++++++++++ config/rootfiles/core/129/filelists/strongswan | 1 + config/rootfiles/core/129/update.sh | 5 +++++ 3 files changed, 16 insertions(+) create mode 120000 config/rootfiles/core/129/filelists/strongswan diff --git a/config/rootfiles/core/129/filelists/files b/config/rootfiles/core/129/filelists/files index 168c7d188b..093f43ff00 100644 --- 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 index 0000000000..90c727e265 --- /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 5ce0cff05d..6d248cd02d 100644 --- 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 -- 2.39.2