diff options
| author | Alberto Gonzalez Iniesta <agi@inittab.org> | 2016-01-20 14:08:23 +0100 |
|---|---|---|
| committer | Alberto Gonzalez Iniesta <agi@inittab.org> | 2016-01-20 14:09:32 +0100 |
| commit | fcbae04d9e2349588b7969572f577d9f3ae72094 (patch) | |
| tree | 5dbe2d8b53417248da95ae64d7ea4694c5a84599 | |
| parent | 12e09aa53c44a997888b28533f44a3cc887cd36e (diff) | |
Fix #799592, #796914
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/openvpn.init.d | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index ae87af7..06b2a6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ openvpn (2.3.10-1) unstable; urgency=medium Drop password_prompt_in_systemd.patch. Applied upstream. * Unify pidfile path on systemd and sysV. (Closes: #811010) Thanks Guillem Jover for noticing. + * Increase start-stop-daemon timeout on stop to let openvpn + tear down the connection properly in some cases. + (Closes: #799592, #796914) -- Alberto Gonzalez Iniesta <agi@inittab.org> Wed, 20 Jan 2016 12:01:36 +0100 diff --git a/debian/openvpn.init.d b/debian/openvpn.init.d index 8507ace..ae88417 100644 --- a/debian/openvpn.init.d +++ b/debian/openvpn.init.d @@ -96,7 +96,7 @@ start_vpn () { } stop_vpn () { start-stop-daemon --stop --quiet --oknodo \ - --pidfile $PIDFILE --exec $DAEMON --retry 5 + --pidfile $PIDFILE --exec $DAEMON --retry 10 if [ "$?" -eq 0 ]; then rm -f $PIDFILE [ "$OMIT_SENDSIGS" -ne 1 ] || rm -f /run/sendsigs.omit.d/openvpn.$NAME.pid |