From 3adf2f558e157ef5087ca44f13e097a394ef7c78 Mon Sep 17 00:00:00 2001 From: Jesse Young Date: Mon, 1 Nov 2010 11:33:26 -0500 Subject: Remove hardcoded path to resolvconf Signed-off-by: Jesse Young Acked-by: David Sommerseth Signed-off-by: David Sommerseth --- contrib/pull-resolv-conf/client.down | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'contrib/pull-resolv-conf/client.down') diff --git a/contrib/pull-resolv-conf/client.down b/contrib/pull-resolv-conf/client.down index 38c585b..05f2d4d 100644 --- a/contrib/pull-resolv-conf/client.down +++ b/contrib/pull-resolv-conf/client.down @@ -34,9 +34,10 @@ # A horrid work around, from a security perspective, # is to run OpenVPN as root. THIS IS NOT RECOMMENDED. You have # been WARNED. +PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin -if [ -x /sbin/resolvconf ] ; then - /sbin/resolvconf -d "${1}" +if type resolvconf >/dev/null 2>&1; then + resolvconf -d "${1}" -f elif [ -e /etc/resolv.conf.ovpnsave ] ; then # cp + rm rather than mv in case it's a symlink cp /etc/resolv.conf.ovpnsave /etc/resolv.conf -- cgit v1.2.3