diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-11-27 15:41:17 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-11-27 15:41:17 +0100 |
| commit | a2ac9fac16eeb626d3969092fecf463650750640 (patch) | |
| tree | ab54dfe9c575e1bf719735e859ac136e375cf5c8 /python/vyos/ifconfig/interface.py | |
| parent | fb7e761ae3efa8f17d9199f29dae2fdc1f51f188 (diff) | |
| download | vyos-1x-a2ac9fac16eeb626d3969092fecf463650750640.tar.gz vyos-1x-a2ac9fac16eeb626d3969092fecf463650750640.zip | |
vyos.template: T2720: always enable Jinja2 trim_blocks feature
Diffstat (limited to 'python/vyos/ifconfig/interface.py')
| -rw-r--r-- | python/vyos/ifconfig/interface.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py index 39b80ce08..43cd7220a 100644 --- a/python/vyos/ifconfig/interface.py +++ b/python/vyos/ifconfig/interface.py @@ -890,9 +890,9 @@ class Interface(Control): self._config = dict_merge(tmp, self._config) render(options_file, 'dhcp-client/daemon-options.tmpl', - self._config, trim_blocks=True) + self._config) render(config_file, 'dhcp-client/ipv4.tmpl', - self._config, trim_blocks=True) + self._config) # 'up' check is mandatory b/c even if the interface is A/D, as soon as # the DHCP client is started the interface will be placed in u/u state. @@ -919,7 +919,7 @@ class Interface(Control): if enable and 'disable' not in self._config: render(config_file, 'dhcp-client/ipv6.tmpl', - self._config, trim_blocks=True) + self._config) # We must ignore any return codes. This is required to enable DHCPv6-PD # for interfaces which are yet not up and running. |