From a49417497985c3675f4aa59367a40eda0d90fd82 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Florian=20B=C3=BChrle?= <florian.buehrle@ipfire.org>
Date: Wed, 8 May 2019 11:43:11 +0100
Subject: [PATCH] udev: Accept MAC addresses for PARENT_DEV

This allows us to create VLAN interfaces even when the
name of the parent interface might vary.

This patch also appends the VLAN tag to interfaces
when the zone is in bridge mode.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/udev/network-hotplug-vlan | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/config/udev/network-hotplug-vlan b/config/udev/network-hotplug-vlan
index f7b6a9de15..178e1a67ba 100644
--- a/config/udev/network-hotplug-vlan
+++ b/config/udev/network-hotplug-vlan
@@ -23,40 +23,51 @@
 
 [ -n "${INTERFACE}" ] || exit 2
 
-CONFIG_FILE="/var/ipfire/ethernet/vlans"
+VLAN_CONFIG_FILE="/var/ipfire/ethernet/vlans"
+MAIN_CONFIG_FILE="/var/ipfire/ethernet/settings"
 
-# Skip immediately if no configuration file has been found.
-[ -e "${CONFIG_FILE}" ] || exit 0
+# Skip immediately if a configuration file is missing.
+[ -e "${VLAN_CONFIG_FILE}" ] && [ -e "${MAIN_CONFIG_FILE}" ] || exit 0
 
-eval $(/usr/local/bin/readhash ${CONFIG_FILE})
+eval $(/usr/local/bin/readhash ${VLAN_CONFIG_FILE})
+eval $(/usr/local/bin/readhash ${MAIN_CONFIG_FILE})
 
 for interface in green0 red0 blue0 orange0; do
 	case "${interface}" in
 		green*)
+			ZONE_MODE=${GREEN_MODE}
 			PARENT_DEV=${GREEN_PARENT_DEV}
 			VLAN_ID=${GREEN_VLAN_ID}
 			MAC_ADDRESS=${GREEN_MAC_ADDRESS}
 			;;
 		red*)
+			ZONE_MODE=${RED_MODE}
 			PARENT_DEV=${RED_PARENT_DEV}
 			VLAN_ID=${RED_VLAN_ID}
 			MAC_ADDRESS=${RED_MAC_ADDRESS}
 			;;
 		blue*)
+			ZONE_MODE=${BLUE_MODE}
 			PARENT_DEV=${BLUE_PARENT_DEV}
 			VLAN_ID=${BLUE_VLAN_ID}
 			MAC_ADDRESS=${BLUE_MAC_ADDRESS}
 			;;
 		orange*)
+			ZONE_MODE=${ORANGE_MODE}
 			PARENT_DEV=${ORANGE_PARENT_DEV}
 			VLAN_ID=${ORANGE_VLAN_ID}
 			MAC_ADDRESS=${ORANGE_MAC_ADDRESS}
 			;;
 	esac
 
-	# If the parent device does not match the interface that
+	# If the parent device (MAC or name) does not match the interface that
 	# has just come up, we will go on for the next one.
-	[ "${PARENT_DEV}" = "${INTERFACE}" ] || continue
+	[ "${PARENT_DEV}" = "${INTERFACE}" ] || [ "${PARENT_DEV}" = "$(</sys/class/net/${INTERFACE}/address)" ] || continue
+
+	# If the current zone is operating in bridge mode, give the VLAN interface a generic name (e.g. eth0.99 for VLAN 99 on eth0)
+	if [ "${ZONE_MODE}" = "bridge" ]; then
+		interface="${INTERFACE}.${VLAN_ID}"
+	fi
 
 	# Check if the interface does already exists.
 	# If so, we skip creating it.
@@ -71,7 +82,7 @@ for interface in green0 red0 blue0 orange0; do
 	fi
 
 	# Build command line.
-	command="ip link add link ${PARENT_DEV} name ${interface}"
+	command="ip link add link ${INTERFACE} name ${interface}"
 	if [ -n "${MAC_ADDRESS}" ]; then
 		command="${command} address ${MAC_ADDRESS}"
 	fi
@@ -81,7 +92,7 @@ for interface in green0 red0 blue0 orange0; do
 	${command}
 
 	# Bring up the parent device.
-	ip link set ${PARENT_DEV} up
+	ip link set ${INTERFACE} up
 done
 
 exit 0
-- 
2.39.2