From 1138fa195ca060a188a522fc978780c920d8c4c2 Mon Sep 17 00:00:00 2001
From: Ainar Garipov <a.garipov@adguard.com>
Date: Tue, 16 Mar 2021 18:04:53 +0300
Subject: [PATCH] Pull request: DHCP: doc new opts
Merge in DNS/adguard-home-wiki from 2385-dhcp-opt to master
Squashed commit of the following:
commit 9ba4442733f32bb54bd20e4d1ae76341a78b2b4e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Mar 16 18:02:40 2021 +0300
DHCP: fix typo
commit 34eaa5ec75e798e1052088bcf0dca64a1d77c23c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Mar 16 17:46:16 2021 +0300
DHCP: doc new opts
---
DHCP.md | 27 +++++++++++++++++++++++++--
1 file changed, 25 insertions(+), 2 deletions(-)
diff --git a/DHCP.md b/DHCP.md
index f75f167..e40f227 100644
--- a/DHCP.md
+++ b/DHCP.md
@@ -72,7 +72,31 @@ use:
- '6 ip 1.2.3.4'
```
-An easier format for multiple IP addresses is planned, see issue [#2385].
+The `ips` format (since **v0.106.0**) is the same, but with comma-separated
+IP-addresses:
+
+```yaml
+# …
+'dhcp':
+ # …
+ 'dhcpv4':
+ # …
+ 'options':
+ - '6 ips 1.2.3.4,5.6.7.8'
+```
+
+The `text` format (since **v0.106.0**) allows you to put arbitrary UTF-8 text as
+the option data. For example:
+
+```yaml
+# …
+'dhcp':
+ # …
+ 'dhcpv4':
+ # …
+ 'options':
+ - '252 text http://example.com'
+```
### <a id="config-6" href="#config-6">DHCPv6 Options</a>
@@ -82,7 +106,6 @@ clients to use SLAAC. The DHCPv6 server won't be started in this case.
The option `dhcp.dhcpv6.ra_allow_slaac`, if `true`, sends RA packets allowing
the clients to choose between SLAAC and DHCPv6.
-[#2385]: https://github.com/AdguardTeam/AdGuardHome/issues/2385
[configuration]: https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration
## <a id="autohosts" href="#autohosts">Automatic Hosts</a>