From 5b6f90e4beebc2cc95b09ec1f978519c0cdfb76a Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Thu, 13 Jul 2017 00:41:00 +0200
Subject: [PATCH] cpe: discriminate wifi ifnames with -eap suffix

---
 salt/cpe/ap.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/salt/cpe/ap.sh b/salt/cpe/ap.sh
index a9ecf21..0fed2c7 100644
--- a/salt/cpe/ap.sh
+++ b/salt/cpe/ap.sh
@@ -310,11 +310,17 @@ delete wireless.radio{{ radionum }}.disabled
 {%-   for ssid, ssidconf in radio['ssids'].items() %}
 {%-     set ifnum = ifnum + loop.index0 %}
 set wireless.wifi{{ ifnum }}=wifi-iface
-{%- if radio['channel'] < 15 %}
-set wireless.wifi{{ ifnum }}.ifname=wlan2-{{ ssidconf['net'] }}
-{%- else %}
-set wireless.wifi{{ ifnum }}.ifname=wlan5-{{ ssidconf['net'] }}
-{%- endif %}
+{%-     if radio['channel'] < 15 %}
+{%-       set ifprefix = 'wlan2-' %}
+{%-     else %}
+{%-       set ifprefix = 'wlan5-' %}
+{%-     endif %}
+{%-     if ssidconf.get('wpa-eap') %}
+{%-       set ifsuffix = '-eap' %}
+{%-     else %}
+{%-       set ifsuffix = '' %}
+{%-     endif %}
+set wireless.wifi{{ ifnum }}.ifname={{ ifprefix }}{{ ssidconf['net'] }}{{ ifsuffix }}
 set wireless.wifi{{ ifnum }}.device=radio{{ radionum }}
 set wireless.wifi{{ ifnum }}.ssid='{{ ssid }}'
 set wireless.wifi{{ ifnum }}.mode=ap