diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-04-08 19:52:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-08 19:52:03 +0200 |
| commit | f9ebccd2ef0b144617b5f4acf79d37502114d34a (patch) | |
| tree | 9c96321f2432ee11db826a7051b4b5adefc030c5 /data/templates | |
| parent | 2bf7589e926b3d5f2f7aee0f98505eeb14fc826d (diff) | |
| parent | f43031ec4591662fadee3176fe1ace2ac018a9df (diff) | |
| download | vyos-1x-f9ebccd2ef0b144617b5f4acf79d37502114d34a.tar.gz vyos-1x-f9ebccd2ef0b144617b5f4acf79d37502114d34a.zip | |
Merge pull request #1278 from sever-sever/T4344
dhcp-server: T4344: Fix underscores for shared network name
Diffstat (limited to 'data/templates')
| -rw-r--r-- | data/templates/dhcp-server/dhcpd.conf.tmpl | 4 | ||||
| -rw-r--r-- | data/templates/dhcp-server/dhcpdv6.conf.tmpl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/templates/dhcp-server/dhcpd.conf.tmpl b/data/templates/dhcp-server/dhcpd.conf.tmpl index f4297fe5f..00f6eba8e 100644 --- a/data/templates/dhcp-server/dhcpd.conf.tmpl +++ b/data/templates/dhcp-server/dhcpd.conf.tmpl @@ -62,7 +62,7 @@ subnet {{ address | network_from_ipv4 }} netmask {{ address | netmask_from_ipv4 # Shared network configration(s) {% if shared_network_name is vyos_defined %} {% for network, network_config in shared_network_name.items() if network_config.disable is not vyos_defined %} -shared-network {{ network | replace('_','-') }} { +shared-network {{ network }} { {% if network_config.authoritative is vyos_defined %} authoritative; {% endif %} @@ -215,7 +215,7 @@ shared-network {{ network | replace('_','-') }} { {% endfor %} {% endif %} on commit { - set shared-networkname = "{{ network | replace('_','-') }}"; + set shared-networkname = "{{ network }}"; {% if hostfile_update is vyos_defined %} set ClientIp = binary-to-ascii(10, 8, ".", leased-address); set ClientMac = binary-to-ascii(16, 8, ":", substring(hardware, 1, 6)); diff --git a/data/templates/dhcp-server/dhcpdv6.conf.tmpl b/data/templates/dhcp-server/dhcpdv6.conf.tmpl index c6a4f4c92..1a55668e1 100644 --- a/data/templates/dhcp-server/dhcpdv6.conf.tmpl +++ b/data/templates/dhcp-server/dhcpdv6.conf.tmpl @@ -15,7 +15,7 @@ option dhcp6.name-servers {{ global_parameters.name_server | join(', ') }}; # Shared network configration(s) {% if shared_network_name is vyos_defined %} {% for network, network_config in shared_network_name.items() if network_config.disable is not vyos_defined %} -shared-network {{ network | replace('_','-') }} { +shared-network {{ network }} { {% if network_config.common_options is vyos_defined %} {% if network_config.common_options.info_refresh_time is vyos_defined %} option dhcp6.info-refresh-time {{ network_config.common_options.info_refresh_time }}; @@ -117,7 +117,7 @@ shared-network {{ network | replace('_','-') }} { {% endfor %} {% endif %} on commit { - set shared-networkname = "{{ network | replace('_','-') }}"; + set shared-networkname = "{{ network }}"; } } {% endfor %} |