From 6e3da4072ddb3626c3779311df62be4fe1f3b9ac Mon Sep 17 00:00:00 2001
From: Jesse Young <jesse.young@gmail.com>
Date: Tue, 8 Mar 2011 21:36:57 -0600
Subject: [PATCH] Prefer resolvconf if it exists

Signed-off-by: Jesse Young <jesse.young@gmail.com>
---
 ip-down.d.dns.sh |    8 ++++++++
 ip-up.d.dns.sh   |    8 ++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/ip-down.d.dns.sh b/ip-down.d.dns.sh
index 9e19f7d..a6757ba 100644
--- a/ip-down.d.dns.sh
+++ b/ip-down.d.dns.sh
@@ -1,3 +1,11 @@
 #!/bin/sh
 
+PATH="$PATH:/usr/sbin/"
+export PATH
+
+if which resolvconf >/dev/null 2>&1; then
+    resolvconf -f -d ${IFNAME}
+    exit $?
+fi
+
 [ -e /etc/resolv.conf.backup.${IFNAME} ] && mv /etc/resolv.conf.backup.${IFNAME} /etc/resolv.conf
diff --git a/ip-up.d.dns.sh b/ip-up.d.dns.sh
index f9df543..1525aae 100644
--- a/ip-up.d.dns.sh
+++ b/ip-up.d.dns.sh
@@ -1,6 +1,14 @@
 #!/bin/sh
 
+PATH="$PATH:/usr/sbin/"
+export PATH
+
 if [ "$USEPEERDNS" = "1" -a -f /etc/ppp/resolv.conf ]; then
+  if which resolvconf >/dev/null 2>&1; then
+      resolvconf -a ${IFNAME} < /etc/ppp/resolv.conf
+      exit $?
+  fi
+
   [ -e /etc/resolv.conf ] && mv /etc/resolv.conf /etc/resolv.conf.backup.${IFNAME}
   mv /etc/ppp/resolv.conf /etc/resolv.conf
   chmod 644 /etc/resolv.conf
-- 
1.7.4.1