diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-04-03 20:11:23 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-04-03 20:58:51 +0200 |
| commit | e604b99c46b8fa4f1a2a7f0228085a85311ebfb8 (patch) | |
| tree | 84cd3e048c76264ec36e17bff5ee70efceb69ae3 /src/conf_mode | |
| parent | 588dee1177c5f9c3341ce6b948045e65f7bd93bf (diff) | |
| download | vyos-1x-e604b99c46b8fa4f1a2a7f0228085a85311ebfb8.tar.gz vyos-1x-e604b99c46b8fa4f1a2a7f0228085a85311ebfb8.zip | |
[dhcpv6-relay] T1322: bugfix on multiple upstream interfaces
When generation the configuration for multiple upstream interfaces a whitespace
was missing in the generated configuration:
OPTIONS="-6 -l 2001:db8::ffff%eth1 -u 2001:db8:1:ffff%eth2-u 2001:db8:2:ffff%eth3"
^---
This caused an error when starting up the DHCPv6 relay service
(cherry picked from commit c6988bb4110541478dad74d0b892fd4643ed530a)
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/dhcpv6_relay.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/conf_mode/dhcpv6_relay.py b/src/conf_mode/dhcpv6_relay.py index 86e3f8265..2b2b1f48b 100755 --- a/src/conf_mode/dhcpv6_relay.py +++ b/src/conf_mode/dhcpv6_relay.py @@ -30,8 +30,8 @@ config_tmpl = """ ### Autogenerated by dhcpv6_relay.py ### # Defaults for isc-dhcpv6-relay initscript sourced by /etc/init.d/isc-dhcpv6-relay +OPTIONS="-6 -l {{ listen_addr | join('-l ') }} -u {{ upstream_addr | join(' -u ') }} {{ options | join(' ') }}" -OPTIONS="-6 -l {{ listen_addr | join('-l ') }} {{ options | join(' ') }} -u {{ upstream_addr | join('-u ') }}" """ default_config_data = { |