diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-03-28 21:06:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-28 21:06:28 +0100 |
| commit | edfb41097096af6127e3932f186cde37c27b5bfc (patch) | |
| tree | b6b2dd741b570b4d10e17239a797b099055a4b0d /src/conf_mode | |
| parent | d74f6594be0a6d7697c9deb5a677a82576139b98 (diff) | |
| parent | 72a47361a4a7d352a8be61ea3feaa0f7f6e66745 (diff) | |
| download | vyos-1x-edfb41097096af6127e3932f186cde37c27b5bfc.tar.gz vyos-1x-edfb41097096af6127e3932f186cde37c27b5bfc.zip | |
Merge pull request #282 from thomas-mangin/T2057-mac-hwid
ifconfig: T2057: Do not set empty hw_id mac
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/interfaces-ethernet.py | 2 | ||||
| -rwxr-xr-x | src/conf_mode/interfaces-wireless.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/conf_mode/interfaces-ethernet.py b/src/conf_mode/interfaces-ethernet.py index 286cab88e..15e9b4185 100755 --- a/src/conf_mode/interfaces-ethernet.py +++ b/src/conf_mode/interfaces-ethernet.py @@ -359,7 +359,7 @@ def apply(eth): # if custom mac is removed if eth['mac']: e.set_mac(eth['mac']) - else: + elif eth['hw_id']: e.set_mac(eth['hw_id']) # Maximum Transmission Unit (MTU) diff --git a/src/conf_mode/interfaces-wireless.py b/src/conf_mode/interfaces-wireless.py index 2c67c39ae..454ad96dc 100755 --- a/src/conf_mode/interfaces-wireless.py +++ b/src/conf_mode/interfaces-wireless.py @@ -1496,7 +1496,7 @@ def apply(wifi): # if custom mac is removed if wifi['mac']: w.set_mac(wifi['mac']) - else: + elif wifi['hw_id']: w.set_mac(wifi['hw_id']) # configure ARP filter configuration |