Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #15575 from pprindeville/strongswan-always-generate-var-strongswan

Browse source 
strongswan: swanctl init script doesn't load connections
This commit is contained in:
Philip Prindeville 2021-05-07 17:28:37 -06:00 committed by GitHub
commit 7aa92e4d4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/strongswan/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=strongswan PKG_NAME:=strongswan
PKG_VERSION:=5.9.2 PKG_VERSION:=5.9.2
PKG_RELEASE:=6 PKG_RELEASE:=7
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/ PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/

13
net/strongswan/files/swanctl.init
View file

@ -517,10 +517,6 @@ config_ipsec() {
local interface local interface
local device_list local device_list
swan_reset
swanctl_reset
do_preamble
config_get debug "$1" debug 0 config_get debug "$1" debug 0
config_get_bool rtinstall_enabled "$1" rtinstall_enabled 1 config_get_bool rtinstall_enabled "$1" rtinstall_enabled 1
[ $rtinstall_enabled -eq 1 ] && install_routes=yes || install_routes=no [ $rtinstall_enabled -eq 1 ] && install_routes=yes || install_routes=no
@ -546,7 +542,9 @@ config_ipsec() {
done done
[ -n "$device_list" ] && WAIT_FOR_INTF=0 || WAIT_FOR_INTF=1 [ -n "$device_list" ] && WAIT_FOR_INTF=0 || WAIT_FOR_INTF=1
fi fi
}
do_postamble() {
swan_xappend0 "# generated by /etc/init.d/swanctl" swan_xappend0 "# generated by /etc/init.d/swanctl"
swan_xappend0 "charon {" swan_xappend0 "charon {"
swan_xappend1 "install_routes = $install_routes" swan_xappend1 "install_routes = $install_routes"
@ -566,9 +564,16 @@ config_ipsec() {
prepare_env() { prepare_env() {
mkdir -p /var/ipsec /var/swanctl mkdir -p /var/ipsec /var/swanctl
swan_reset
swanctl_reset
do_preamble
config_load ipsec config_load ipsec
config_foreach config_ipsec ipsec config_foreach config_ipsec ipsec
config_foreach config_remote remote config_foreach config_remote remote
do_postamble
} }
service_running() { service_running() {