summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorAlberto Gonzalez Iniesta <agi@inittab.org>2015-11-12 17:16:28 +0100
committerBernhard Schmidt <berni@debian.org>2017-06-29 22:05:33 +0200
commitafc11370be9fd149ab361ca183c9715777b50df0 (patch)
treed4f40e79db26f84cd97f2a0240eb273bbd5fc0d2 /debian
parentb35ad09bfc4a26e7ea456f01596aa86576a62b3b (diff)
Import Debian changes 2.3.4-5+deb8u1debian/2.3.4-5+deb8u1
openvpn (2.3.4-5+deb8u1) stable; urgency=medium * Add --no-block to if-up.d script to avoid hanging boot on interfaces with openvpn instances. (Closes: #787090, #785200)
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rw-r--r--debian/openvpn.if-up.d2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 93d908b..05e193c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openvpn (2.3.4-5+deb8u1) stable; urgency=medium
+
+ * Add --no-block to if-up.d script to avoid hanging boot on
+ interfaces with openvpn instances. (Closes: #787090, #785200)
+
+ -- Alberto Gonzalez Iniesta <agi@inittab.org> Thu, 12 Nov 2015 17:16:28 +0100
+
openvpn (2.3.4-5) unstable; urgency=high
* Apply upstream patch that fixes possible DoS by authenticated
diff --git a/debian/openvpn.if-up.d b/debian/openvpn.if-up.d
index feb4d6b..3e88f18 100644
--- a/debian/openvpn.if-up.d
+++ b/debian/openvpn.if-up.d
@@ -13,7 +13,7 @@ if [ -n "$IF_OPENVPN" ]; then
for vpn in $IF_OPENVPN; do
## check systemd present
if [ -d $SYSTEMD ]; then
- $SYSTEMCTL start openvpn@$vpn
+ $SYSTEMCTL --no-block start openvpn@$vpn
else
$OPENVPN_INIT start $vpn
fi