summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-04-03 20:11:23 +0200
committerChristian Poessinger <christian@poessinger.com>2019-04-03 20:11:23 +0200
commitc6988bb4110541478dad74d0b892fd4643ed530a (patch)
tree264f1d306db890c0b5e1464ca1fe81522e3c3267 /src
parentdea25e199fc095aa64dc2f8b80aa152a2f4c6870 (diff)
downloadvyos-1x-c6988bb4110541478dad74d0b892fd4643ed530a.tar.gz
vyos-1x-c6988bb4110541478dad74d0b892fd4643ed530a.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
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/dhcpv6_relay.py2
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 = {