From 03770cdacb750344cdb0eaa260ad6d56684293c0 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Tue, 26 Apr 2022 18:42:20 +0200 Subject: dhcp: T4389: fix vendor name, it is ubiquiti with an i, not yx --- data/templates/dhcp-server/dhcpd.conf.j2 | 6 +++--- interface-definitions/dhcp-server.xml.in | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/templates/dhcp-server/dhcpd.conf.j2 b/data/templates/dhcp-server/dhcpd.conf.j2 index 4eb472951..4c2da0aa5 100644 --- a/data/templates/dhcp-server/dhcpd.conf.j2 +++ b/data/templates/dhcp-server/dhcpd.conf.j2 @@ -23,7 +23,7 @@ option rfc3442-static-route code 121 = array of integer 8; option windows-static-route code 249 = array of integer 8; option wpad-url code 252 = text; -# Vendor specific options - Ubiquity Networks +# Vendor specific options - Ubiquiti Networks option space ubnt; option ubnt.unifi-controller code 1 = ip-address; class "ubnt" { @@ -203,8 +203,8 @@ shared-network {{ network }} { } {% endfor %} {% endif %} -{% if subnet_config.vendor_option.ubiquity.unifi_controller is vyos_defined %} - option ubnt.unifi-controller {{ subnet_config.vendor_option.ubiquity.unifi_controller }}; +{% if subnet_config.vendor_option.ubiquiti.unifi_controller is vyos_defined %} + option ubnt.unifi-controller {{ subnet_config.vendor_option.ubiquiti.unifi_controller }}; {% endif %} {% if subnet_config.range is vyos_defined %} {# pool configuration can only be used if there follows a range option #} diff --git a/interface-definitions/dhcp-server.xml.in b/interface-definitions/dhcp-server.xml.in index 19c1d0593..0158e777b 100644 --- a/interface-definitions/dhcp-server.xml.in +++ b/interface-definitions/dhcp-server.xml.in @@ -419,9 +419,9 @@ Vendor Specific Options - + - Ubiquity specific parameters + Ubiquiti specific parameters -- cgit v1.2.3