Commit fe5f0d6f authored by Jouke Witteveen's avatar Jouke Witteveen
Browse files

Restrict dhcpcd to IPv4

By default, dhcpcd requests leases for both versions of IPv6.
In the past, dhcpcd did not support IPv6, so this commits restores old
behavior.
parent 032dfba3
......@@ -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}" $DhcpcdOptions "$Interface" 2>&1 | report_debug "$(cat)"
do_debug dhcpcd -4qL -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'"
......@@ -39,7 +39,7 @@ ip_set() {
;;
dhclient)
rm -f "/run/dhclient-${Interface}.pid"
if ! do_debug dhclient -q -e "TIMEOUT=${TimeoutDHCP:-10}" -pf "/run/dhclient-$Interface.pid" $DhclientOptions "$Interface"; then
if ! do_debug dhclient -4 -q -e "TIMEOUT=${TimeoutDHCP:-10}" -pf "/run/dhclient-$Interface.pid" $DhclientOptions "$Interface"; then
report_error "DHCP IP lease attempt failed on interface '$Interface'"
return 1
fi
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment