From 2d6d510e63e8d93c6c476cc2d4bf401269fca6fc Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 28 Dec 2017 19:28:20 -0500 Subject: [PATCH] always support Ethernet-to-Internet on RPi: use discovered_wireless_iface (not iiab_wireless_lan_iface) to toggle AP --- roles/network/templates/network/dhcpcd.conf.j2 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/roles/network/templates/network/dhcpcd.conf.j2 b/roles/network/templates/network/dhcpcd.conf.j2 index a7e8508db..2c74f18e5 100644 --- a/roles/network/templates/network/dhcpcd.conf.j2 +++ b/roles/network/templates/network/dhcpcd.conf.j2 @@ -37,9 +37,11 @@ require dhcp_server_identifier # Generate Stable Private IPv6 Addresses instead of hardware based ones slaac private -# IIAB -{% if is_rpi %} -#denyinterfaces {% if iiab_wireless_lan_iface is defined %} {{ iiab_wireless_lan_iface }} {% endif %} +# IIAB - always support Ethernet-to-Internet on RPi +{% if is_rpi and manually_toggle_AP %} +#denyinterfaces {% if discovered_wireless_iface != "none" %} {{ discovered_wireless_iface }} {% endif %} +{% elif is_rpi %} +denyinterfaces {% if discovered_wireless_iface != "none" %} {{ discovered_wireless_iface }} {% endif %} {% else %} denyinterfaces {% if iiab_wireless_lan_iface is defined %} {{ iiab_wireless_lan_iface }} {% endif %} {% if iiab_wired_lan_iface is defined %} {{ iiab_wired_lan_iface }} {% endif %} {% endif %}