Merging upstream version 20210629.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 32 insertions, 36 deletions

diff --git a/libexec/container/start b/libexec/container/start
index 08c3611..6b35ea8 100755
--- a/libexec/container/start
+++ b/libexec/container/start
@@ -367,42 +367,6 @@ then
 			;;
 	esac
 
-	NETWORK_BRIDGES="$(awk -Fcnt.network-bridge= '/^cnt.network-bridge=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
-
-	case "${NETWORK_BRIDGES}" in
-		"")
-			;;
-
-		*)
-			for BRIDGE_DEFINITION in ${NETWORK_BRIDGES}
-			do
-				INTERFACE="$(echo ${BRIDGE_DEFINITION} | awk -F: '{ print $1 }')"
-				BRIDGE="$(echo ${BRIDGE_DEFINITION} | awk -F: '{ print $2 }')"
-
-				if [ "$(echo ${INTERFACE} | wc -c)" -gt 15 ]
-				then
-					echo "'${INTERFACE}': name exceeds maximum of 15 characters, network might be not working."
-				fi
-
-				if [ -n "${BRIDGE}" ] && [ -n "${INTERFACE}" ]
-				then
-
-cat > "/etc/network/interfaces.d/${INTERFACE}" << EOF
-allow-hotplug ${INTERFACE}
-iface ${INTERFACE} inet manual
-	pre-up ip link set ${INTERFACE} up
-	post-up ip link set ${INTERFACE} master ${BRIDGE}
-	pre-down ip link set ${INTERFACE} nomaster
-	post-down ip link set ${INTERFACE} down
-EOF
-
-				else
-					echo "Warning bridge definition '${BRIDGE_DEFINITION}' not recognized (expected <bridge>:<interface>): Ignoring"
-				fi
-			done
-			;;
-	esac
-
 	PRIVATE_USERS="$(awk -Fprivate-users= '/^private-users=/ { print $2 }' ${CONFIG}/${NAME}.conf || echo no)"
 
 	case "${PRIVATE_USERS}" in
@@ -536,3 +500,35 @@ case "${START}" in
 		esac
 		;;
 esac
+
+# waiting for systemd-nspawn to create the veth interfaces
+sleep 1
+NETWORK_BRIDGES="$(awk -Fcnt.network-bridge= '/^cnt.network-bridge=/ { print $2 }' ${CONFIG}/${NAME}.conf)"
+
+case "${NETWORK_BRIDGES}" in
+	"")
+		;;
+
+	*)
+		for BRIDGE_DEFINITION in ${NETWORK_BRIDGES}
+		do
+			INTERFACE="$(echo ${BRIDGE_DEFINITION} | awk -F: '{ print $1 }')"
+			BRIDGE="$(echo ${BRIDGE_DEFINITION} | awk -F: '{ print $2 }')"
+
+			if [ "$(echo ${INTERFACE} | wc -c)" -gt 15 ]
+			then
+				echo "'${INTERFACE}': name exceeds maximum of 15 characters, network might be not working."
+			fi
+
+			if [ -n "${BRIDGE}" ] && [ -n "${INTERFACE}" ]
+			then
+
+				ip link set "${INTERFACE}" up
+				ovs-vsctl --may-exist add-port "${BRIDGE}" "${INTERFACE}"
+
+			else
+				echo "Warning bridge definition '${BRIDGE_DEFINITION}' not recognized (expected <bridge>:<interface>): Ignoring"
+			fi
+		done
+		;;
+esac