diff options
author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2022-04-08 13:47:14 +0000 |
---|---|---|
committer | Viacheslav Hletenko <v.gletenko@vyos.io> | 2022-04-18 11:03:31 +0000 |
commit | f71f9b4a2c40ae4d617f7ddefbdaabb136e887b3 (patch) | |
tree | 110499f16da48dfe80866f053271efee768bd2da /data/templates/dhcp-server/dhcpd.conf.tmpl | |
parent | bd50d51f1e49724c9a01e9ce5c0aefa04ec3e913 (diff) | |
download | vyos-1x-f71f9b4a2c40ae4d617f7ddefbdaabb136e887b3.tar.gz vyos-1x-f71f9b4a2c40ae4d617f7ddefbdaabb136e887b3.zip |
dhcp-server: T4344: Fix underscores for shared network name
Shared network name should not be handled by tag node mangling
I.e. should not replace underscores with dashed
set service dhcp-server shared-network-name NET_01
shared-network NET_01 {
authoritative;
...
on commit {
set shared-networkname = "NET_01";
}
}
(cherry picked from commit b75b351b7dd2ec87407f98668468b1fc146428bf)
Diffstat (limited to 'data/templates/dhcp-server/dhcpd.conf.tmpl')
-rw-r--r-- | data/templates/dhcp-server/dhcpd.conf.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/templates/dhcp-server/dhcpd.conf.tmpl b/data/templates/dhcp-server/dhcpd.conf.tmpl index dbd864b5e..0f0c622d4 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 defined and shared_network_name is not none %} {% for network, network_config in shared_network_name.items() if network_config.disable is not defined %} -shared-network {{ network | replace('_','-') }} { +shared-network {{ network }} { {% if network_config.authoritative is defined %} authoritative; {% endif %} @@ -212,7 +212,7 @@ shared-network {{ network | replace('_','-') }} { {% endfor %} {% endif %} on commit { - set shared-networkname = "{{ network | replace('_','-') }}"; + set shared-networkname = "{{ network }}"; {% if hostfile_update is defined %} set ClientIp = binary-to-ascii(10, 8, ".", leased-address); set ClientMac = binary-to-ascii(16, 8, ":", substring(hardware, 1, 6)); |