From: Harald Dunkel <harald.dunkel@aixigo.de>
Date: Tue, 14 Mar 2017 12:42:15 +0000 (+0000)
Subject: Fix lxc-containers to support multiple bridges
X-Git-Tag: lxc-2.1.0~183^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fc698019cfb7bea47fae5cbfb4af8b44f4a7f52;p=thirdparty%2Flxc.git

Fix lxc-containers to support multiple bridges

Signed-off-by: Harald Dunkel <harald.dunkel@aixigo.de>
---

diff --git a/config/init/common/lxc-containers.in b/config/init/common/lxc-containers.in
index ebce36e3e..ef5a80bc4 100644
--- a/config/init/common/lxc-containers.in
+++ b/config/init/common/lxc-containers.in
@@ -51,7 +51,7 @@ fi
 # to start
 wait_for_bridge()
 {
-    local BRNAME try flags
+    local BRNAME try flags br
     [ -f "$sysconfdir"/lxc/default.conf ] || { return 0; }
 
     BRNAME=`grep '^[ 	]*lxc.network.link' "$sysconfdir"/lxc/default.conf | sed 's/^.*=[ 	]*//'`
@@ -60,11 +60,12 @@ wait_for_bridge()
     fi
 
     for try in `seq 1 30`; do
-        if [ -r /sys/class/net/$BRNAME/flags ]; then
-            read flags < /sys/class/net/$BRNAME/flags
-            [ $((flags & 0x1)) -eq 1 ] && { return 0; }
-        fi
-        sleep 1
+	for br in ${BRNAME}; do
+	     [ -r /sys/class/net/${br}/flags ] || { sleep 1; continue 2; }
+	     read flags < /sys/class/net/${br}/flags
+	     [ $((flags & 0x1)) -eq 1 ] || { sleep 1; continue 2; }
+	 done
+	return 0
     done
 }