summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlberto Gonzalez Iniesta <agi@inittab.org>2015-07-01 14:06:31 +0200
committerAlberto Gonzalez Iniesta <agi@inittab.org>2015-07-01 14:06:31 +0200
commit44b0699b3e5a04300308683bd55a058bfff9d157 (patch)
treeb1919befb889757faa81efa5ec11cdb5ac8453b0
parent36e6270cd1fdac93994548f1563b4f5fd5c24628 (diff)
New upstream. Fix #787090 #785200 #771626
-rw-r--r--debian/changelog9
-rw-r--r--debian/openvpn.if-up.d2
-rw-r--r--debian/openvpn.service1
3 files changed, 11 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index de37804..2b8cac8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+openvpn (2.3.7-1) unstable; urgency=medium
+
+ * New upstream version
+ * Add --no-block to if-up.d script to avoid hanging boot on
+ interfaces with openvpn instances. (Closes: #787090, #785200)
+ * Add ProtectSystem=yes to systemd's service file. (Closes: #771626)
+
+ -- Alberto Gonzalez Iniesta <agi@inittab.org> Wed, 01 Jul 2015 13:19:26 +0200
+
openvpn (2.3.5-1) unstable; urgency=medium
* New upstream release. Removed patches applied upstream:
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
diff --git a/debian/openvpn.service b/debian/openvpn.service
index 0075cc4..58669f4 100644
--- a/debian/openvpn.service
+++ b/debian/openvpn.service
@@ -11,6 +11,7 @@ RemainAfterExit=yes
ExecStart=/bin/true
ExecReload=/bin/true
WorkingDirectory=/etc/openvpn
+ProtectSystem=yes
[Install]
WantedBy=multi-user.target