From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] Drop support for macvtap
Date: Wed, 07 Apr 2021 14:56:16 +0000
Message-ID: <20210407145616.15648-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8765144999545812974=="
List-Id: <development.lists.ipfire.org>

--===============8765144999545812974==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

From: Daniel Weism=C3=BCller <daniel.weismueller(a)ipfire.org>

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 <michael.tremer(a)ipfire.org>
---
 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"
 <Plugin interface>
 	Interface "lo"
 	Interface "/[0-9]*phys$/"
-	Interface "/^macvtap[0-9]*$/"
 	Interface "/^vnet[0-9]*$/"
 	IgnoreSelected true
 </Plugin>
diff --git a/config/rootfiles/core/156/filelists/files b/config/rootfiles/cor=
e/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
=20
+# Migrate any macvtap interfaces to bridge
+sed -e "s/_MODE=3Dmacvtap/_MODE=3Dbridge/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-hotplu=
g-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
 		;;
=20
-	macvtap)
-		ADDRESS=3D"$(</sys/class/net/${INTERFACE}/address)"
-		GENERATED_ADDRESS=3D$(random_mac_address)
-
-		ip link add link "${INTERFACE}" "${BRIDGE}" address "${ADDRESS}" type macv=
lan mode bridge
-		ip link set "${INTERFACE}" address "${GENERATED_ADDRESS}"
-		ip link set "${INTERFACE}" up
-		;;
-
 	"")
 		exit 0
 		;;
diff --git a/config/udev/network-hotplug-rename b/config/udev/network-hotplug=
-rename
index 8807e0ab8..73e811e94 100644
--- a/config/udev/network-hotplug-rename
+++ b/config/udev/network-hotplug-rename
@@ -78,16 +78,6 @@ for zone in ${ZONES}; do
 				(( counter +=3D 1 ))
 			done
 			;;
-
-		macvtap)
-			# MACVTAP mode doesn't work for WiFi devices
-			if [ -d "/sys/class/net/${INTERFACE}/phy80211" ]; then
-				logger -t network "MACVTAP mode is not supported for wireless devices"
-				echo "${!device}"
-			else
-				echo "${!device%0}phys0"
-			fi
-			;;
 	esac
 done
=20
diff --git a/html/cgi-bin/zoneconf.cgi b/html/cgi-bin/zoneconf.cgi
index ad0ec85fa..62f18e308 100644
--- a/html/cgi-bin/zoneconf.cgi
+++ b/html/cgi-bin/zoneconf.cgi
@@ -345,8 +345,6 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{"save"}) {
 		if ($zone_mode eq "BRIDGE") {
 			$ethsettings{"${uc}_MODE"} =3D "bridge";
 			$ethsettings{"${uc}_SLAVES"} =3D $slave_string;
-		} elsif ($zone_mode eq "MACVTAP") {
-			$ethsettings{"${uc}_MODE"} =3D "macvtap";
 		}
=20
 		# STP options
@@ -423,8 +421,6 @@ foreach (@zones) {
 		$mode_selected{"DEFAULT"} =3D "selected";
 	} elsif ($zone_mode eq "bridge") {
 		$mode_selected{"BRIDGE"} =3D "selected";
-	} elsif ($zone_mode eq "macvtap") {
-		$mode_selected{"MACVTAP"} =3D "selected";
 	}
=20
 	print <<END
@@ -432,7 +428,6 @@ foreach (@zones) {
 			<select name=3D"MODE $uc" data-zone=3D"$uc" onchange=3D"changeZoneMode(th=
is)">
 				<option value=3D"DEFAULT" $mode_selected{"DEFAULT"}>$Lang::tr{"zoneconf =
nicmode default"}</option>
 				<option value=3D"BRIDGE" $mode_selected{"BRIDGE"}>$Lang::tr{"zoneconf ni=
cmode bridge"}</option>
-				<option value=3D"MACVTAP" $mode_selected{"MACVTAP"}>$Lang::tr{"zoneconf =
nicmode macvtap"}</option>
 			</select>
 		</td>
 END
--=20
2.20.1


--===============8765144999545812974==--