From 6c5af3f722c41b5c17588217fecdea6a2096fc6f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 3 May 2018 15:41:58 +0200
Subject: [rfs-stage31] Bring br0 up even if we don't have an IP yet

---
 core/rootfs/rootfs-stage31/data/inc/setup_network | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core')

diff --git a/core/rootfs/rootfs-stage31/data/inc/setup_network b/core/rootfs/rootfs-stage31/data/inc/setup_network
index 897469cc..76195780 100644
--- a/core/rootfs/rootfs-stage31/data/inc/setup_network
+++ b/core/rootfs/rootfs-stage31/data/inc/setup_network
@@ -65,11 +65,11 @@ for LINE in $IP_OUT; do
 		if [ -n "$CLIENTIP" ] ; then
 			# set static ip address
 			ip addr add "$CLIENTIP/$(ipcalc -s -p "$CLIENTIP" "$SUBNET_MASK" | sed "s/.*=//")" broadcast "$BROADCAST_ADDRESS" dev "$BRIDGE"
-			ip link set dev "$BRIDGE" up
 			[ -n "$GATEWAY" ] && ip route add default via "$GATEWAY" dev "$BRIDGE"
 		else
 			NOIPYET="yes"
 		fi
+		ip link set dev "$BRIDGE" up
 		# Ignore this device later on when systemd handles network interfaces (see hacked 99-systemd.rules in systemd data dir)
 		echo "SUBSYSTEM==\"net\", ACTION==\"add\", KERNEL==\"eth*\", ATTR{address}==\"$IFMAC\", TAG+=\"openslxignore\"" >> "${FUTURE_ROOT}/etc/udev/rules.d/01-ignore-boot-interface.rules"
 	else
-- 
cgit v1.2.3-55-g7522