diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-02-23 12:27:55 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-02-23 14:36:56 +0100 |
| commit | 2fec7394434f8daace485e97a7287cc8233fa178 (patch) | |
| tree | ea833ff35c5515a86ee30470a362c97722384b92 /src | |
| parent | cf5b8ca0f6de111e792c3243c8e1adc8bdb998c6 (diff) | |
| download | vyos-1x-2fec7394434f8daace485e97a7287cc8233fa178.tar.gz vyos-1x-2fec7394434f8daace485e97a7287cc8233fa178.zip | |
pppoe: T1318: declutter name-server CLI nodes
Instead of letting the user choose between auto and none where auto is default,
it makes more sesne to just offer an option to disable the default behavior.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/conf_mode/interfaces-pppoe.py | 8 | ||||
| -rwxr-xr-x | src/migration-scripts/interfaces/4-to-5 | 9 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/conf_mode/interfaces-pppoe.py b/src/conf_mode/interfaces-pppoe.py index d2147fa1f..4ca7f3ecb 100755 --- a/src/conf_mode/interfaces-pppoe.py +++ b/src/conf_mode/interfaces-pppoe.py @@ -104,7 +104,7 @@ default_config_data = { 'ipv6_enable': False, 'local_address': '', 'mtu': '1492', - 'name_server': 'auto', + 'name_server': True, 'remote_address': '', 'service_name': '', 'source_interface': '' @@ -185,9 +185,9 @@ def get_config(): if conf.exists(['mtu']): pppoe['mtu'] = conf.return_value(['mtu']) - # IPv4 address of local end of the PPPoE link - if conf.exists(['name-server']): - pppoe['name_server'] = conf.return_value(['name-server']) + # Do not use DNS servers provided by the peer + if conf.exists(['no-peer-dns']): + pppoe['name_server'] = False # IPv4 address for remote end of PPPoE session if conf.exists(['remote-address']): diff --git a/src/migration-scripts/interfaces/4-to-5 b/src/migration-scripts/interfaces/4-to-5 index dd1e9a51e..2a42c60ff 100755 --- a/src/migration-scripts/interfaces/4-to-5 +++ b/src/migration-scripts/interfaces/4-to-5 @@ -19,6 +19,15 @@ def migrate_dialer(config, tree, intf): # parts config.copy(tree + [pppoe], pppoe_base) + # Instead of letting the user choose between auto and none + # where auto is default, it makes more sesne to just offer + # an option to disable the default behavior (declutter CLI) + if config.exists(pppoe_base + ['name-server']): + tmp = config.return_value(pppoe_base + ['name-server']) + if tmp == "none": + config.set(pppoe_base + ['no-peer-dns']) + config.delete(pppoe_base + ['name-server']) + # Migrate user-id and password nodes under an 'authentication' # node if config.exists(pppoe_base + ['user-id']): |