diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-11-03 18:22:55 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-11-03 19:55:22 +0100 |
| commit | 01e3d935a34f38e48364724da1cad7cbbb18576e (patch) | |
| tree | 4c51edde25c05e215b2ed96a01764fe610bbaf51 /src/conf_mode/interfaces-wireless.py | |
| parent | f8e6d879e7491049b8f634351258a37bbe603590 (diff) | |
| download | vyos-1x-01e3d935a34f38e48364724da1cad7cbbb18576e.tar.gz vyos-1x-01e3d935a34f38e48364724da1cad7cbbb18576e.zip | |
wireless: T3042: move wifi-regulatory-domain into individual interface definition
Diffstat (limited to 'src/conf_mode/interfaces-wireless.py')
| -rwxr-xr-x | src/conf_mode/interfaces-wireless.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/conf_mode/interfaces-wireless.py b/src/conf_mode/interfaces-wireless.py index a18a21b83..5d723bbfd 100755 --- a/src/conf_mode/interfaces-wireless.py +++ b/src/conf_mode/interfaces-wireless.py @@ -109,11 +109,6 @@ def get_config(config=None): if tmp: wifi = dict_merge(tmp, wifi) - # retrieve configured regulatory domain - conf.set_level(['system']) - if conf.exists(['wifi-regulatory-domain']): - wifi['country_code'] = conf.return_value(['wifi-regulatory-domain']) - # Only one wireless interface per phy can be in station mode tmp = find_other_stations(conf, base, wifi['ifname']) if tmp: wifi['station_interfaces'] = tmp @@ -144,8 +139,7 @@ def verify(wifi): if wifi['type'] == 'access-point': if 'country_code' not in wifi: - raise ConfigError('Wireless regulatory domain is mandatory,\n' \ - 'use "set system wifi-regulatory-domain" for configuration.') + raise ConfigError('Wireless country-code is mandatory') if 'channel' not in wifi: raise ConfigError('Wireless channel must be configured!') |