From a1d3b0cb74c2c5c192bcaafbdfe7f99e7a4e495d Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 4 May 2018 11:53:18 +0200
Subject: [rfs-stage31] Ordering

---
 core/rootfs/rootfs-stage31/data/inc/setup_network | 3 ++-
 1 file changed, 2 insertions(+), 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 6a196b82..b067100d 100644
--- a/core/rootfs/rootfs-stage31/data/inc/setup_network
+++ b/core/rootfs/rootfs-stage31/data/inc/setup_network
@@ -64,12 +64,13 @@ for LINE in $IP_OUT; do
 		# of it into several variables
 		if [ -n "$CLIENTIP" ] ; then
 			# set static ip address
+			ip link set dev "$BRIDGE" up
 			ip addr add "$CLIENTIP/$(ipcalc -s -p "$CLIENTIP" "$SUBNET_MASK" | sed "s/.*=//")" broadcast "$BROADCAST_ADDRESS" dev "$BRIDGE"
 			[ -n "$GATEWAY" ] && ip route add default via "$GATEWAY" dev "$BRIDGE"
 		else
+			ip link set dev "$BRIDGE" up
 			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