diff options
| author | Yousong Zhou <yszhou4tech@gmail.com> | 2017-05-08 13:07:47 +0800 |
|---|---|---|
| committer | Yousong Zhou <yszhou4tech@gmail.com> | 2017-06-19 12:37:24 +0800 |
| commit | dbc36c30921220ed9d66e54f7773b8fdb1ea5ecc (patch) | |
| tree | ef59c18d70cef35e8eda8083b2a8f66922e84cbb /net/openconnect/files | |
| parent | cd79492ae2700b7ab0b36148211031f6e9185f72 (diff) | |
openconnect: openconnect-wrapper: rewrite
- use exec directly to eliminate a level in the process tree
- use "$@" instead of "$*" to pass arguments to openconnect
According to openconnect(8), openconnect will call vpnc-script to
cleanup before quit when it received SIGINT(2) and will quit immediately
when it received SIGTERM (the default signal by kill command)
Before and after the change, openconnect process will be killed first
with SIGINT sent from netifd. This was decided by the
'proto_kill_command "$config" 2' notify call in the proto script.
SIGKILL is the only other signal that can be sent from netifd when the
process did not quit on SIGINT on time. There should be no need to trap
on signal 1 3 6 9 (HUP QUIT ABRT KILL)
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Diffstat (limited to 'net/openconnect/files')
| -rwxr-xr-x | net/openconnect/files/openconnect-wrapper | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/net/openconnect/files/openconnect-wrapper b/net/openconnect/files/openconnect-wrapper index 082dfba73..8a4ff78f9 100755 --- a/net/openconnect/files/openconnect-wrapper +++ b/net/openconnect/files/openconnect-wrapper @@ -10,32 +10,4 @@ test -z "$1" && exit 1 pwfile=$1 shift - -pidfile=/var/run/ocwrap-$$.pid - -cleanup() -{ - if ! test -z "$pid";then - kill $pid - wait $pid - fi - exit 0 -} - -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 & -pid=$! - -wait $pid +exec /usr/sbin/openconnect "$@" <$pwfile |