diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-11-05 01:10:36 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-11-05 01:10:36 +0100 |
| commit | 7713fb958f606672804789ff431aa1f691ef4a46 (patch) | |
| tree | c19972185118dfa2c8d2f76974a86e1d44feb7d5 /src/conf_mode/dhcpv6_relay.py | |
| parent | af3a5142dce9fb3d6f3fecdbccfd1cae23b31c62 (diff) | |
| parent | d6c39f624a2ced96015d1e915d90e80acda3babb (diff) | |
| download | vyos-1x-7713fb958f606672804789ff431aa1f691ef4a46.tar.gz vyos-1x-7713fb958f606672804789ff431aa1f691ef4a46.zip | |
Merge branch 'current' of https://github.com/vyos/vyos-1x into current
Diffstat (limited to 'src/conf_mode/dhcpv6_relay.py')
| -rwxr-xr-x | src/conf_mode/dhcpv6_relay.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/conf_mode/dhcpv6_relay.py b/src/conf_mode/dhcpv6_relay.py index 959bf0496..86e3f8265 100755 --- a/src/conf_mode/dhcpv6_relay.py +++ b/src/conf_mode/dhcpv6_relay.py @@ -31,13 +31,12 @@ config_tmpl = """ # Defaults for isc-dhcpv6-relay initscript sourced by /etc/init.d/isc-dhcpv6-relay -OPTIONS="-6 -l {{ listen_addr | join('-l ') }} {% if port -%} -p {{ port }}{%- endif %} {{ options | join(' ') }} -u {{ upstream_addr | join('-u ') }}" +OPTIONS="-6 -l {{ listen_addr | join('-l ') }} {{ options | join(' ') }} -u {{ upstream_addr | join('-u ') }}" """ default_config_data = { 'listen_addr': [], 'upstream_addr': [], - 'port': '', 'options': [], } @@ -65,11 +64,6 @@ def get_config(): server = addr + '%' + intf relay['upstream_addr'].append(server) - # Listen and transmit on port <xy>. This is mostly useful for debugging - # purposes. Default is port 67 for DHCPv4/BOOTP, or port 547 for DHCPv6. - if conf.exists('listen-port'): - relay['port'] = conf.return_value('listen-port') - # Maximum hop count. When forwarding packets, dhcrelay discards packets # which have reached a hop count of COUNT. Default is 10. Maximum is 255. if conf.exists('max-hop-count'): |