summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2018-07-30 13:03:57 +0200
committerJörg Frings-Fürst <debian@jff.email>2018-07-30 13:03:57 +0200
commita8169a774bb7cc60bd2aa3efde295114933a51b7 (patch)
treeb307e8bd11b32483febeee1c97cd20b10a7015bf
parenta46f14d0910a892004a90bb0e246d30daa7d7003 (diff)
d/update-resolv-conf: Add syslog message if used without binary resolvconf
-rw-r--r--debian/changelog7
-rw-r--r--debian/update-resolv-conf6
2 files changed, 10 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index eda4a49..4825d1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,11 +20,14 @@ openvpn (2.4.6-1) UNRELEASED; urgency=medium
- Replace outdated dh_installsystemd with dh_systemd_start.
- Remove usr/share/doc/openvpn/COPYING.
- Replace rm -f with $(RM).
+ * debian/update-resolv-conf:
+ - Fix "preserve order of pushed parameters" (Closes: #807808).
+ Thanks to Thibaut Chèze.
+ - Add syslog message if used without binary resolvconf (Closes: #895135).
+ Thanks to Roger Price <debian@rogerprice.org>.
* debian/watch:
- Use secure URI.
* Remove obsolete debian/openvpn.lintian-overrides.
- * Fix "preserve order of pushed parameters in update-resolv-conf"
- (Closes: #807808). Thanks to Thibaut Chèze.
* New README.source to explain the branching model used.
-- Jörg Frings-Fürst <debian@jff.email> Sun, 29 Jul 2018 13:59:15 +0200
diff --git a/debian/update-resolv-conf b/debian/update-resolv-conf
index 5bebaa4..61b15d9 100644
--- a/debian/update-resolv-conf
+++ b/debian/update-resolv-conf
@@ -15,7 +15,11 @@
# foreign_option_3='dhcp-option DOMAIN be.bnc.ch'
#
-[ -x /sbin/resolvconf ] || exit 0
+if [ ! -x /sbin/resolvconf ] ; then
+ logger "[OpenVPN:update-resolve-conf] missing binary /sbin/resolvconf";
+ exit 0;
+fi
+
[ "$script_type" ] || exit 0
[ "$dev" ] || exit 0