From patchwork Wed Apr 7 14:56:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4117 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 4FFnXV0fZcz3yBV for ; Wed, 7 Apr 2021 14:56:26 +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 4FFnXT0pvwznm; Wed, 7 Apr 2021 14:56:25 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FFnXS6jB0z2yHP; Wed, 7 Apr 2021 14:56:24 +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 4FFnXR6yK0z2xCN for ; Wed, 7 Apr 2021 14:56:23 +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 4FFnXR1XHnzQ1; Wed, 7 Apr 2021 14:56:23 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1617807383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d2bzkG+wft//JyPqiSfZ/POuPZUebnhEI7K1RV0QLW0=; b=9Im9JlQs80vBlcVs/X7ZVPcbtzceJLa5gThLx0dT36wgOplMrs7TjVbrRT6kRZVLnA7HCj hsPfbozFicnZrcCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1617807383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d2bzkG+wft//JyPqiSfZ/POuPZUebnhEI7K1RV0QLW0=; b=HgXDm6dANwmyqCIbuT/G8oGA0lfgxwY0eoG2mp84cxt3fs0EX94Ok13C9HRjohCd+2VN7U PJ2aT7uZjNLCqI3twry9xn383XAigibL4LnggSNjHexZv3sVb1ePWV/Yk9y6xJV7sBaPQG 6SpXmMkJta5lQaer+xJkBwNauxibxzeIeUEd0J8ZmiuoIqIlyvAJeHAtIPVB83b/d30QhH g1oPq+7sOeTMwwVfoFUM/nZqDahuyK+XSsl0g6V7f8q4zDj+Fo0K0+Lk3tsC65OZMr5LhI ZFNFsC8patLSFLqSEce532LoyNjV9fUrl5S8igBLZicMluQKieZxbmg+ZkHxdw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] Drop support for macvtap Date: Wed, 7 Apr 2021 14:56:16 +0000 Message-Id: <20210407145616.15648-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" From: Daniel Weismüller This has been broken because of other changes on the network scripts and since we now have support for bridges there is no point in supporting something else that has the same functionality. Signed-off-by: Michael Tremer --- config/collectd/collectd.conf | 1 - config/rootfiles/core/156/filelists/files | 3 +++ config/rootfiles/core/156/update.sh | 4 ++++ config/udev/network-hotplug-bridges | 9 --------- config/udev/network-hotplug-rename | 10 ---------- html/cgi-bin/zoneconf.cgi | 5 ----- 6 files changed, 7 insertions(+), 25 deletions(-) diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf index c2316e415..941c631c9 100644 --- a/config/collectd/collectd.conf +++ b/config/collectd/collectd.conf @@ -36,7 +36,6 @@ include "/etc/collectd.precache" Interface "lo" Interface "/[0-9]*phys$/" - Interface "/^macvtap[0-9]*$/" Interface "/^vnet[0-9]*$/" IgnoreSelected true diff --git a/config/rootfiles/core/156/filelists/files b/config/rootfiles/core/156/filelists/files index 7dfa5a044..ea8d7ca6b 100644 --- a/config/rootfiles/core/156/filelists/files +++ b/config/rootfiles/core/156/filelists/files @@ -1,5 +1,8 @@ +etc/collectd.conf etc/rc.d/init.d/suricata etc/sysctl.conf +lib/udev/network-hotplug-bridges +lib/udev/network-hotplug-rename srv/web/ipfire/cgi-bin/entropy.cgi srv/web/ipfire/cgi-bin/firewall.cgi srv/web/ipfire/cgi-bin/getrrdimage.cgi diff --git a/config/rootfiles/core/156/update.sh b/config/rootfiles/core/156/update.sh index d078c01cd..fd83d94ba 100644 --- a/config/rootfiles/core/156/update.sh +++ b/config/rootfiles/core/156/update.sh @@ -58,6 +58,10 @@ rm -rfv /usr/lib/perl5/5.30.0 # Reload sysctl.conf sysctl -p +# Migrate any macvtap interfaces to bridge +sed -e "s/_MODE=macvtap/_MODE=bridge/g" \ + -i /var/ipfire/ethernet/settings + # Start services telinit u /etc/init.d/suricata restart diff --git a/config/udev/network-hotplug-bridges b/config/udev/network-hotplug-bridges index a2ee56b83..bacf722ef 100644 --- a/config/udev/network-hotplug-bridges +++ b/config/udev/network-hotplug-bridges @@ -112,15 +112,6 @@ case "${MODE}" in ip link set dev "${INTERFACE}" up ;; - macvtap) - ADDRESS="$( - END