tags 905392 + pending thanks
Hello Gerben, thank you for spending your time helping to make Debian better with this bug report. I have changed the script to test if a service file exist at /etc/systemd/system. CU Jörg -- New: GPG Fingerprint: 63E0 075F C8D4 3ABB 35AB 30EE 09F8 9F3C 8CA1 D25D GPG key (long) : 09F89F3C8CA1D25D GPG Key : 8CA1D25D CAcert Key S/N : 0E:D4:56 Old pgp Key: BE581B6E (revoked since 2014-12-31). Jörg Frings-Fürst D-54470 Lieser git: https://jff.email/cgit/ Threema: SYR8SJXB Wire: @joergfringsfuerst Skype: joergpenguin Ring: jff Telegram: @joergfringsfuerst My wish list: - Please send me a picture from the nature at your home.
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 <debian@jff.email> 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
signature.asc
Description: This is a digitally signed message part
