commit 2765d7b779d75b096badea858a1640c901c7e92d
parent d3f98cc3b5c1993162aa0d1611c7d7f182523b4f
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Tue, 7 Jul 2015 22:48:44 +0200
openconnect: corrected call to proto_add_host_dependency
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Diffstat:
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/net/openconnect/Makefile b/net/openconnect/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openconnect
PKG_VERSION:=7.06
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_USE_MIPS16:=0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/net/openconnect/files/openconnect.sh b/net/openconnect/files/openconnect.sh
@@ -26,11 +26,12 @@ proto_openconnect_setup() {
json_get_vars server port username serverhash authgroup password password2 interface token_mode token_secret os csd_wrapper
grep -q tun /proc/modules || insmod tun
+ ifname="vpn-$config"
logger -t openconnect "initializing..."
serv_addr=
for ip in $(resolveip -t 10 "$server"); do
- ( proto_add_host_dependency "$config" "$ip" $interface )
+ ( proto_add_host_dependency "$interface" "$ip" "$ifname" )
serv_addr=1
done
[ -n "$serv_addr" ] || {
@@ -42,7 +43,7 @@ proto_openconnect_setup() {
[ -n "$port" ] && port=":$port"
- cmdline="$server$port -i vpn-$config --non-inter --syslog --script /lib/netifd/vpnc-script"
+ cmdline="$server$port -i "$ifname" --non-inter --syslog --script /lib/netifd/vpnc-script"
# migrate to standard config files
[ -f "/etc/config/openconnect-user-cert-vpn-$config.pem" ] && mv "/etc/config/openconnect-user-cert-vpn-$config.pem" "/etc/openconnect/user-cert-vpn-$config.pem"
