From 3fabc9d95196ccb1cc301efff812929c777ff692 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 2 Sep 2019 19:56:04 -0400 Subject: [PATCH] wan_ipv4ll -> wan_link_local --- roles/network/templates/network/dhcpcd.conf.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/network/templates/network/dhcpcd.conf.j2 b/roles/network/templates/network/dhcpcd.conf.j2 index e1a1b57e5..aaec0ad19 100644 --- a/roles/network/templates/network/dhcpcd.conf.j2 +++ b/roles/network/templates/network/dhcpcd.conf.j2 @@ -66,11 +66,11 @@ static domain_name_servers={{ wan_nameserver }} {% if wan_try_dhcp_then_static_ip == "true" %} interface {{ iiab_wan_iface }} -{% if wan_ipv4ll == "false" %} -arping 192.0.2.1 -fallback {{ wan_gateway }} +{% if wan_link_local == "false" %} +arping 192.0.2.1 # Set Ethernet IP per "cablemodem" DHCP, if DHCP's on wire (after arp request to non-existent IP 192.0.2.1 intentionally fails, per RFC5737) +fallback {{ wan_gateway }} # If DHCP not detected after seconds, set Ethernet Static IP per "profile " {% else %} -arping {{ wan_gateway }} +arping {{ wan_gateway }} # Perform up to 3 steps: 1. arp (if detected, set Ethernet Static IP per "profile ") 2. Set Ethernet IP per "cablemodem" DHCP, if DHCP's on wire 3. If nec, set Ethernet IP to a link-local address (169.254.x.y) {% endif %} {% endif %} {% endif %}