From f888fc8a5dc53491830353c83315a8fffd202d29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 4 Aug 2018 16:44:36 +0200 Subject: d/openvpn-generator: Use service file from /etc/systemd/system if exists --- debian/changelog | 7 +++++++ debian/openvpn-generator | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7f4b2a4..989a4b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +openvpn (2.4.6-2) UNRELEASED; urgency=medium + + * debian/openvpn-generator: + - Use service file from /etc/systemd/system if exists (Closes: #905392). + + -- Jörg Frings-Fürst Sat, 04 Aug 2018 15:14:58 +0200 + openvpn (2.4.6-1) unstable; urgency=medium [ Jörg Frings-Fürst ] diff --git a/debian/openvpn-generator b/debian/openvpn-generator index d6ac1aa..b51344f 100755 --- a/debian/openvpn-generator +++ b/debian/openvpn-generator @@ -4,16 +4,27 @@ # tunnels listed in /etc/default/openvpn's AUTOSTART be started/stopped/reloaded # when openvpn.service is started/stopped/reloaded. +# +# Changelog: +# +# 2018-08-04 jff use service file from /etc/systemd/system if exists. +# + set -eu GENDIR="$1" WANTDIR="$1/openvpn.service.wants" SERVICEFILE="/lib/systemd/system/openvpn@.service" +SERVICEFILEMAN="/etc/systemd/system/openvpn@.service" AUTOSTART="all" CONFIG_DIR=/etc/openvpn mkdir -p "$WANTDIR" +if test -e ${SERVICEFILEMAN} ; then + SERVICEFILE=${SERVICEFILEMAN} +fi + if test -e /etc/default/openvpn ; then . /etc/default/openvpn fi -- cgit v1.2.3