From 8522e629b7b70a55ffa46531e1995949e89a93ed Mon Sep 17 00:00:00 2001
From: James Rayner <james@archlinux.org>
Date: Sat, 4 Oct 2008 09:32:14 +1000
Subject: Adjust arguments for dhcpcd 4.x

---
 src/ethernet.subr | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ethernet.subr b/src/ethernet.subr
index d6a6970..7df59b1 100644
--- a/src/ethernet.subr
+++ b/src/ethernet.subr
@@ -41,9 +41,9 @@ ethernet_up() {
             # Clear remaining pid files. 
             rm -f /var/run/dhcpcd-${INTERFACE}.{pid,cache} >/dev/null 2>&1
             # If using own dns, tell dhcpcd to NOT replace resolv.conf
-            [[ -n "$DNS1" ]] && DHCP_OPTIONS="-R $DHCP_OPTIONS"
+            [[ -n "$DNS1" ]] && DHCP_OPTIONS="-C resolv.conf $DHCP_OPTIONS"
             # Start dhcpcd
-            if ! dhcpcd -L -t $DHCP_TIMEOUT $DHCP_OPTIONS $INTERFACE; then
+            if ! dhcpcd -qL -t $DHCP_TIMEOUT $DHCP_OPTIONS $INTERFACE; then
                 err_append "DHCP IP lease attempt failed"
                 return 1
             fi 
@@ -98,7 +98,7 @@ ethernet_down() {
             fi
         else
             if [[ -f /var/run/dhcpcd-${INTERFACE}.pid ]]; then
-                dhcpcd -x $INTERFACE
+                dhcpcd -qx $INTERFACE
             fi
         fi
         ;;
-- 
cgit v1.2.3-24-g4f1b