From 0f2fab49802539da0cda444523ce1bfea74f324a Mon Sep 17 00:00:00 2001 From: rebortg Date: Sat, 28 Jan 2023 21:45:41 +0100 Subject: dhcp-relay: sync branches --- docs/configuration/service/dhcp-relay.rst | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/configuration/service/dhcp-relay.rst b/docs/configuration/service/dhcp-relay.rst index b9aefbfb..b489b600 100644 --- a/docs/configuration/service/dhcp-relay.rst +++ b/docs/configuration/service/dhcp-relay.rst @@ -8,7 +8,8 @@ If you want your router to forward DHCP requests to an external DHCP server you can configure the system to act as a DHCP relay agent. The DHCP relay agent works with IPv4 and IPv6 addresses. -All interfaces used for the DHCP relay must be configured. +All interfaces used for the DHCP relay must be configured. This includes the +uplink to the DHCP server. ********** IPv4 relay @@ -19,7 +20,8 @@ Configuration .. cfgcmd:: set service dhcp-relay interface - Enable the DHCP relay service on the given interface. + Interfaces that participate in the DHCP relay process, including the uplink + to the DHCP server. .. cfgcmd:: set service dhcp-relay server @@ -62,9 +64,9 @@ Example ======= * Listen for DHCP requests on interface ``eth1``. -* DHCP server is located at IPv4 address 10.0.1.4. +* DHCP server is located at IPv4 address 10.0.1.4 on ``eth2``. * Router receives DHCP client requests on ``eth1`` and relays them to the server - at 10.0.1.4. + at 10.0.1.4 on ``eth2``. .. figure:: /_static/images/service_dhcp-relay01.png :scale: 80 % -- cgit v1.2.3