diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-10-13 12:49:47 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-10-13 12:49:47 +0200 |
| commit | 79bc826426385e5b40fbe58137d0a2d2831cf274 (patch) | |
| tree | e21c70c44c5889c3b37eabf9e7a7d6095f842a69 /python/vyos/configdict.py | |
| parent | 5c834feebe5e7749ec731dcf9556ae6997b0b526 (diff) | |
| parent | fe7279454c86a2947b23fb0d769483b7fe2a3cc3 (diff) | |
| download | vyos-1x-79bc826426385e5b40fbe58137d0a2d2831cf274.tar.gz vyos-1x-79bc826426385e5b40fbe58137d0a2d2831cf274.zip | |
Merge branch 'current' of github.com:vyos/vyos-1x into equuleus
* 'current' of github.com:vyos/vyos-1x:
Sync XML interface description source file pattern and conf script name
Python/ifconfig: T1557: add support for DHCPv6 client options
bonding: T1614: support DHCP options on VLAN interfaces
Python/ifconfig: T1557: bugfix when configuring accept_ra on VLAN interfaces
conf_mode: bonding/ethernet fix comments
Jenkins: Docker: always pull container from Dockerhub
Diffstat (limited to 'python/vyos/configdict.py')
| -rw-r--r-- | python/vyos/configdict.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py index 1022b88de..983906923 100644 --- a/python/vyos/configdict.py +++ b/python/vyos/configdict.py @@ -152,11 +152,11 @@ def vlan_to_dict(conf): # DHCPv6 only acquire config parameters, no address if conf.exists('dhcpv6-options parameters-only'): - vlan['dhcpv6_prm_only'] = conf.return_value('dhcpv6-options parameters-only') + vlan['dhcpv6_prm_only'] = True # DHCPv6 temporary IPv6 address if conf.exists('dhcpv6-options temporary'): - vlan['dhcpv6_temporary'] = conf.return_value('dhcpv6-options temporary') + vlan['dhcpv6_temporary'] = True # ignore link state changes if conf.exists('disable-link-detect'): |