dhcpcd: Force setting MTU through dhcpcd

The DHCP server can instruct clients to configure a certain MTU.

This used to be done by setting the MTU of the interface. However,
dhcpcd has changed this behaviour using routes to.

We used to have a modified version of the old mechanism which no longer
works well with the new system and is therefore to be dropped.

This is the first commit in the series implementing the new behaviour
and telling dhcpcd to use the configured MTU.

Fixes: #12563
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/initscripts/networking/functions.network b/src/initscripts/networking/functions.network
index 656e6a7abe55a0ef29430d822e4dbf4239a89e55..96b84a6b85d3e3711dbd0b3f0fb3c79e207e90bb 100644 (file)
--- a/src/initscripts/networking/functions.network
+++ b/src/initscripts/networking/functions.network
@@ -56,7 +56,7 @@ dhcpcd_start() {
        # This function will start a dhcpcd on a speciefied device.
 
        local device="$1"
-       local dhcp_start=""
+       local dhcp_start=()
 
        boot_mesg -n "Starting dhcpcd on the ${device} interface..."
 
@@ -71,11 +71,16 @@ dhcpcd_start() {
 
        # Check if a DHCP hostname has been set.
        if [ -n "${RED_DHCP_HOSTNAME}" ]; then
-               dhcp_start+="-h ${RED_DHCP_HOSTNAME}"
+               dhcp_start+=( "-h" "${RED_DHCP_HOSTNAME}" )
+       fi
+
+       # Tell dhcpcd to use the configured MTU
+       if [ -n "${RED_DHCP_FORCE_MTU}" ]; then
+               dhcp_start+=( "--static" "mtu=${RED_DHCP_FORCE_MTU}" )
        fi
 
        # Start dhcpcd.
-       /sbin/dhcpcd ${dhcp_start} ${device} >/dev/null 2>&1
+       /sbin/dhcpcd "${dhcp_start[@]}" ${device} >/dev/null 2>&1
        ret="$?"
 
        if [ "${ret}" -eq 0 ]; then