summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-09-19 21:26:38 +0200
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-09-19 20:05:02 +0000
commit4af125b3bcf9fb11cc0611862130d8dad6ac60fd (patch)
tree7c67a0677db49e76cf0873e925b4d5152e096e0b
parent1909f2df8017b084dd28e8e05cc266076b2a9980 (diff)
downloadvyos-1x-4af125b3bcf9fb11cc0611862130d8dad6ac60fd.tar.gz
vyos-1x-4af125b3bcf9fb11cc0611862130d8dad6ac60fd.zip
wireless: T6709: fix missing wpa_supplicant configurationmergify/bp/circinus/pr-4087
Commit 0ee8d5e35 ("ethernet: T6709: move EAPoL support to common framework") added support to also have EAPoL on other interface types then ethernet. This introduced a regression where the wireless interface wpa_supplicant configuration would get deleted. (cherry picked from commit 58dfd957fd8ec24caeca73105f7823148ef8c8bf)
-rw-r--r--python/vyos/ifconfig/bond.py3
-rw-r--r--python/vyos/ifconfig/ethernet.py3
-rw-r--r--python/vyos/ifconfig/interface.py3
3 files changed, 6 insertions, 3 deletions
diff --git a/python/vyos/ifconfig/bond.py b/python/vyos/ifconfig/bond.py
index b8ea90049..8ba481728 100644
--- a/python/vyos/ifconfig/bond.py
+++ b/python/vyos/ifconfig/bond.py
@@ -504,3 +504,6 @@ class BondIf(Interface):
# call base class first
super().update(config)
+
+ # enable/disable EAPoL (Extensible Authentication Protocol over Local Area Network)
+ self.set_eapol()
diff --git a/python/vyos/ifconfig/ethernet.py b/python/vyos/ifconfig/ethernet.py
index 8d96c863f..61da7b74b 100644
--- a/python/vyos/ifconfig/ethernet.py
+++ b/python/vyos/ifconfig/ethernet.py
@@ -452,3 +452,6 @@ class EthernetIf(Interface):
# call base class last
super().update(config)
+
+ # enable/disable EAPoL (Extensible Authentication Protocol over Local Area Network)
+ self.set_eapol()
diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py
index 31fcf6ca6..002d3da9e 100644
--- a/python/vyos/ifconfig/interface.py
+++ b/python/vyos/ifconfig/interface.py
@@ -1813,9 +1813,6 @@ class Interface(Control):
value = '1' if (tmp != None) else '0'
self.set_per_client_thread(value)
- # enable/disable EAPoL (Extensible Authentication Protocol over Local Area Network)
- self.set_eapol()
-
# Enable/Disable of an interface must always be done at the end of the
# derived class to make use of the ref-counting set_admin_state()
# function. We will only enable the interface if 'up' was called as