From patchwork Tue Feb 22 12:18:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5219 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4K2yqs3nzjz3xgY for ; Tue, 22 Feb 2022 12:18:17 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4K2yqp2wz6z4n8; Tue, 22 Feb 2022 12:18:14 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4K2yqn6zCbz30H7; Tue, 22 Feb 2022 12:18:13 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4K2yqm02NYz2xVY for ; Tue, 22 Feb 2022 12:18:11 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4K2yql5QwJz29H; Tue, 22 Feb 2022 12:18:11 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1645532291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MTmtPzIiEA4aYW6bNJFReul7dwl8afbYnLN/aQc+i24=; b=oyOhT1U5XAP+d3iLelGaBPjALxOKG9xO2u4V1HvpQvW/fOWklOXfYFFT4U6ihbyjyuY9i4 uh+5jvXB8pH1fvAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1645532291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MTmtPzIiEA4aYW6bNJFReul7dwl8afbYnLN/aQc+i24=; b=ePui7UQtUBQ/RLrtOXHbWcYa+PyTC2ei5NnJ9cf6hzQfASyI8lvyWoQCKt7z8I1Zix3Nt+ k3QZUoHXqNuamjlo1cjcyp33Pj7UJTNHgbNNwZnPPI64PMU7luu/6mznbhSyok9ky4XHcJ 530okazOI++/7hNp080w2V9dnLbNkm7VL9CkUsFo5hiq+9BHGEBhz0eKTn3PG3L7YSb3Bb yRy8/7myUph9lio4oTRDHLjaTOFiaI+yHzFcsAPZmMlmGPF4qmUH4Cfhh0Ys/n5+sw0EmH pWSTtGp2rFv//esZ87AwJao901AvjTaoR1OBP12Z6oyWozzoniSV/hhJHYRJFQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 2/3] dhcpcd: Remove old MTU setting script Date: Tue, 22 Feb 2022 12:18:05 +0000 Message-Id: <20220222121806.1208994-2-michael.tremer@ipfire.org> In-Reply-To: <20220222121806.1208994-1-michael.tremer@ipfire.org> References: <20220222121806.1208994-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is being replaced by adding the MTU option to any routes that dhcpcd installs. Signed-off-by: Michael Tremer Reviewed-by: Peter Müller --- config/dhcpc/dhcpcd-hooks/10-mtu | 33 -------------------------------- config/rootfiles/common/dhcpcd | 1 - lfs/dhcpcd | 1 - 3 files changed, 35 deletions(-) delete mode 100644 config/dhcpc/dhcpcd-hooks/10-mtu diff --git a/config/dhcpc/dhcpcd-hooks/10-mtu b/config/dhcpc/dhcpcd-hooks/10-mtu deleted file mode 100644 index 8eb429751..000000000 --- a/config/dhcpc/dhcpcd-hooks/10-mtu +++ /dev/null @@ -1,33 +0,0 @@ -# Configure the MTU for the interface - -eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) - -set_mtu() -{ - local mtu=$1 - ip link set "$interface" mtu "$mtu" - - # test for buggy nic that lose link at mtu set... - carrier=`cat /sys/class/net/$interface/carrier` - if [ "$carrier" == "0" ]; then - syslog info "Warning! Carrier loss after MTU set. Reinit needed..." - ip link set "$interface" down - ip link set "$interface" up - exit 1 - fi -} - -if [ -n "$new_interface_mtu" ] && $if_up; then - if [ $RED_DHCP_FORCE_MTU -ge 576 ]; then - new_interface_mtu=$RED_DHCP_FORCE_MTU - fi - if [ ! "$new_interface_mtu" == "$ifmtu" ]; then - # The smalled MTU dhcpcd can work with is 576 - if [ "$new_interface_mtu" -gt 576 ]; then - if set_mtu "$new_interface_mtu"; then - syslog info "MTU set to $new_interface_mtu" - fi - fi - fi -fi - diff --git a/config/rootfiles/common/dhcpcd b/config/rootfiles/common/dhcpcd index 672a47a30..d36b105f1 100644 --- a/config/rootfiles/common/dhcpcd +++ b/config/rootfiles/common/dhcpcd @@ -9,7 +9,6 @@ var/ipfire/dhcpc/dhcpcd-hooks #var/ipfire/dhcpc/dhcpcd-hooks/00-linux #var/ipfire/dhcpc/dhcpcd-hooks/01-test #var/ipfire/dhcpc/dhcpcd-hooks/02-dump -#var/ipfire/dhcpc/dhcpcd-hooks/10-mtu #var/ipfire/dhcpc/dhcpcd-hooks/30-hostname #var/ipfire/dhcpc/dhcpcd-hooks/70-dhcpcd.exe var/ipfire/dhcpc/dhcpcd-run-hooks diff --git a/lfs/dhcpcd b/lfs/dhcpcd index 8c4a593ad..8291d076a 100644 --- a/lfs/dhcpcd +++ b/lfs/dhcpcd @@ -90,7 +90,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) rm -f $(CONFIG_ROOT)/dhcpc/dhcpcd-hooks/50-ypbind install -m 644 $(DIR_SRC)/config/dhcpc/dhcpcd.conf $(CONFIG_ROOT)/dhcpc/ - install -m 444 $(DIR_SRC)/config/dhcpc/dhcpcd-hooks/10-mtu $(CONFIG_ROOT)/dhcpc/dhcpcd-hooks chown root:root $(CONFIG_ROOT)/dhcpc/dhcpcd.conf