lede-packages-rs

git clone git://archive.git.mtrnord.blog/MTRNord/lede-packages-rs.git
Log | Files | Refs | README | LICENSE

commit a412f2cc4687534b336ae87a98315270fb8f52f4
parent d834e6c9c2635dd271c47caff9f496a5110dfa30
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date:   Tue, 28 Oct 2014 11:58:42 +0100

openconnect: forward SIGINT to app

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

Diffstat:
Mnet/openconnect/Makefile | 2+-
Mnet/openconnect/files/openconnect-wrapper | 12+++++++++++-
2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/net/openconnect/Makefile b/net/openconnect/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openconnect PKG_VERSION:=6.00 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/openconnect/ diff --git a/net/openconnect/files/openconnect-wrapper b/net/openconnect/files/openconnect-wrapper @@ -22,7 +22,17 @@ cleanup() exit 0 } -trap cleanup 1 2 3 6 15 +cleanup2() +{ + if ! test -z "$pid";then + kill -2 $pid + wait $pid + fi + exit 0 +} + +trap cleanup2 2 +trap cleanup 1 3 6 15 rm -f "$pidfile" /usr/sbin/openconnect $* <$pwfile &