From c6988bb4110541478dad74d0b892fd4643ed530a Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 3 Apr 2019 20:11:23 +0200 Subject: [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 --- src/conf_mode/dhcpv6_relay.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 = { -- cgit v1.2.3