From 85e4bae1ef9e4f929adbf384a6344fe25c6c6689 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 10 Apr 2022 10:08:16 +0200
Subject: eapol: T4333: migrate to new vyos_defined Jinja2 test

---
 data/templates/ethernet/wpa_supplicant.conf.tmpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'data/templates/ethernet/wpa_supplicant.conf.tmpl')

diff --git a/data/templates/ethernet/wpa_supplicant.conf.tmpl b/data/templates/ethernet/wpa_supplicant.conf.tmpl
index 308d777f1..74f0999c1 100644
--- a/data/templates/ethernet/wpa_supplicant.conf.tmpl
+++ b/data/templates/ethernet/wpa_supplicant.conf.tmpl
@@ -31,8 +31,8 @@ ap_scan=0
 fast_reauth=1
 
 network={
-{%  if eapol is defined and eapol is not none %}
-{%    if eapol.ca_certificate is defined and eapol.ca_certificate is not none %}
+{%  if eapol is vyos_defined %}
+{%    if eapol.ca_certificate is vyos_defined %}
     ca_cert="/run/wpa_supplicant/{{ ifname }}_ca.pem"
 {%    endif %}
     client_cert="/run/wpa_supplicant/{{ ifname }}_cert.pem"
@@ -43,7 +43,7 @@ network={
     key_mgmt=IEEE8021X
     eap=TLS
 
-{% if mac is defined and mac is not none %}
+{% if mac is vyos_defined %}
     identity="{{ mac }}"
 {% else %}
     identity="{{ hw_id }}"
-- 
cgit v1.2.3