mirror/openvpn
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2024-09-19 19:42:30 +02:00
Code

Remove hardcoded path to resolvconf

Browse Source 
Signed-off-by: Jesse Young <jesse.young@gmail.com>
Acked-by: David Sommerseth <dazo@users.sourceforge.net>
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
This commit is contained in:
Jesse Young 2010-11-01 11:33:26 -05:00 committed by David Sommerseth
parent 22178d05f7
commit 3adf2f558e
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/pull-resolv-conf/client.down
View File

@ -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

5
contrib/pull-resolv-conf/client.up
View File

@ -33,6 +33,7 @@
# 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
# init variables
@ -86,8 +87,8 @@ fi
out="# resolv.conf autogenerated by ${0} (${1})${nl}${dns}${nl}${ds}${domains}"
# use resolvconf if it's available
if [ -x /sbin/resolvconf ] ; then
printf "%s\n" "${out}" | /sbin/resolvconf -a "${1}"
if type resolvconf >/dev/null 2>&1; then
printf "%s\n" "${out}" | resolvconf -p -a "${1}"
else
# Preserve the existing resolv.conf
if [ -e /etc/resolv.conf ] ; then