Fix DHCPOptions

Split them into different variables for different clients.
Also, IP6 gets its own, so that it can have options different from the
IP4 invocation.

3 files changed, 6 insertions, 6 deletions

diff --git a/docs/netctl.profile.5.txt b/docs/netctl.profile.5.txt
index 504a8b5..061f136 100644
--- a/docs/netctl.profile.5.txt
+++ b/docs/netctl.profile.5.txt
@@ -131,7 +131,7 @@ network. In particular, these connection types are +ethernet+,
     The name of the preferred DHCP client. Supported options are
     `dhcpcd' and `dhclient'. Defaults to `dhcpcd'.
 
-'DHCPOptions='::
+'DhcpcdOptions=', 'DhclientOptions=', 'DhclientOptions6='::
     Additional options to be passed to the DHCP client. Do not use this
     unless you know what you are doing.
 
diff --git a/src/lib/auto.action b/src/lib/auto.action
index 6cb6ff5..feebd77 100755
--- a/src/lib/auto.action
+++ b/src/lib/auto.action
@@ -17,10 +17,10 @@ case $action in
         if [[ -x "$PROFILE_DIR/interfaces/$interface" ]]; then
             source "$PROFILE_DIR/interfaces/$interface"
         fi
-        dhcpcd -qL -t "${TimeoutDHCP:-10}" $DHCPOptions -K "$interface"
+        dhcpcd -qL -t "${TimeoutDHCP:-10}" $DhcpcdOptions -K "$interface"
         exit $?
     fi
-    DHCPOptions+=" -K"
+    DhcpcdOptions+=" -K"
     ip_set || exit 1
     # JP: sandbox the eval
     if ! ( eval $ExecUpPost ); then
diff --git a/src/lib/ip b/src/lib/ip
index 8723e5b..c1f1fc7 100644
--- a/src/lib/ip
+++ b/src/lib/ip
@@ -30,7 +30,7 @@ ip_set() {
             rm -f "/run/dhcpcd-$Interface".{pid,cache}
             # If using own dns, tell dhcpcd to NOT replace resolv.conf
             [[ $DNS ]] && DhcpcdOptions+=" -C resolv.conf"
-            do_debug dhcpcd -qL -t "${TimeoutDHCP:-10}" $DHCPOptions "$Interface" 2>&1 | report_debug "$(cat)"
+            do_debug dhcpcd -qL -t "${TimeoutDHCP:-10}" $DhcpcdOptions "$Interface" 2>&1 | report_debug "$(cat)"
             # The first array value of PIPESTATUS is the exit status of dhcpcd
             if (( PIPESTATUS != 0 )); then
                 report_error "DHCP IP lease attempt failed on interface '$Interface'"
@@ -107,9 +107,9 @@ ip_set() {
             return 1
         fi
         sysctl -q -w "net.ipv6.conf.$interface_sysctl.accept_ra=1"
-        [[ $IP6 == "dhcp-noaddr" ]] && Dhclient6Options+=" -S"
+        [[ $IP6 == "dhcp-noaddr" ]] && DhclientOptions6+=" -S"
         rm -f "/run/dhclient6-${Interface}.pid"
-        if ! do_debug dhclient -6 -q -e "TIMEOUT=${TimeoutDHCP:-10}" -pf "$Pidfile" $Dhclient6Options "$Interface"; then
+        if ! do_debug dhclient -6 -q -e "TIMEOUT=${TimeoutDHCP:-10}" -pf "/run/dhclient6-${Interface}.pid" $DhclientOptions6 "$Interface"; then
             report_error "DHCPv6 IP lease attempt failed on interface '$Interface'"
             return 1
         fi