diff options
| -rw-r--r-- | data/templates/wifi/hostapd.conf.tmpl | 2 | ||||
| -rw-r--r-- | interface-definitions/interfaces-wireless.xml.in | 4 | ||||
| -rwxr-xr-x | src/migration-scripts/interfaces/17-to-18 | 49 |
3 files changed, 52 insertions, 3 deletions
diff --git a/data/templates/wifi/hostapd.conf.tmpl b/data/templates/wifi/hostapd.conf.tmpl index e66e3472b..433e1d36f 100644 --- a/data/templates/wifi/hostapd.conf.tmpl +++ b/data/templates/wifi/hostapd.conf.tmpl @@ -50,7 +50,7 @@ logger_stdout_level=0 # Country code (ISO/IEC 3166-1). Used to set regulatory domain. # Set as needed to indicate country in which device is operating. # This can limit available channels and transmit power. -country_code={{ country_code }} +country_code={{ country_code | upper }} # Enable IEEE 802.11d. This advertises the country_code and the set of allowed # channels and transmit power levels based on the regulatory limits. The diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in index 6b238e313..ebcfee95c 100644 --- a/interface-definitions/interfaces-wireless.xml.in +++ b/interface-definitions/interfaces-wireless.xml.in @@ -447,14 +447,14 @@ <properties> <help>Indicate country in which device is operating</help> <completionHelp> - <list>US EU JP DE UK CN ES FR RU</list> + <list>us eu jp de uk cn es fr ru</list> </completionHelp> <valueHelp> <format><code%gt;</format> <description>ISO/IEC 3166-1 Country Code</description> </valueHelp> <constraint> - <regex>^[A-Z][A-Z]$</regex> + <regex>^[a-z][a-z]$</regex> </constraint> <constraintErrorMessage>Invalid ISO/IEC 3166-1 Country Code</constraintErrorMessage> </properties> diff --git a/src/migration-scripts/interfaces/17-to-18 b/src/migration-scripts/interfaces/17-to-18 new file mode 100755 index 000000000..c382a7e85 --- /dev/null +++ b/src/migration-scripts/interfaces/17-to-18 @@ -0,0 +1,49 @@ +#!/usr/bin/env python3 +# +# Copyright (C) 2020 VyOS maintainers and contributors +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 or later as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# T3043: Move "system wifi-regulatory-domain" to indicidual wireless interface. +# Country Code will be migratred from upper to lower case. + +from sys import exit, argv +from vyos.configtree import ConfigTree + +if __name__ == '__main__': + if (len(argv) < 1): + print("Must specify file name!") + exit(1) + + file_name = argv[1] + with open(file_name, 'r') as f: + config_file = f.read() + + config = ConfigTree(config_file) + + # T3043: WIFI country-code should be lower-case + wifi_base = ['interfaces', 'wireless'] + for wifi in config.list_nodes(wifi_base): + ccode = wifi_base + [wifi, 'country-code'] + if config.exists(ccode): + tmp = config.return_value(ccode) + config.set(ccode, value=tmp.lower(), replace=True) + + + + try: + with open(file_name, 'w') as f: + f.write(config.to_string()) + except OSError as e: + print("Failed to save the modified config: {}".format(e)) + exit(1) |