Skip to content

L
lxc
Unverified Commit 215fff92 by Harald Dunkel Committed by Stéphane Graber
Options

Fix lxc-containers to support multiple bridges

Signed-off-by: 's avatarHarald Dunkel <harald.dunkel@aixigo.de>
parent e0e26721
Showing with 7 additions and 6 deletions
config/init/common/lxc-containers.in
...@@ -51,7 +51,7 @@ fi ...@@ -51,7 +51,7 @@ fi
# to start # to start
wait_for_bridge() wait_for_bridge()
{ {
local BRNAME try flags local BRNAME try flags br
[ -f "$sysconfdir"/lxc/default.conf ] || { return 0; } [ -f "$sysconfdir"/lxc/default.conf ] || { return 0; }
BRNAME=`grep '^[ ]*lxc.network.link' "$sysconfdir"/lxc/default.conf | sed 's/^.*=[ ]*//'` BRNAME=`grep '^[ ]*lxc.network.link' "$sysconfdir"/lxc/default.conf | sed 's/^.*=[ ]*//'`
...@@ -60,11 +60,12 @@ wait_for_bridge() ...@@ -60,11 +60,12 @@ wait_for_bridge()
fi fi
for try in `seq 1 30`; do for try in `seq 1 30`; do
if [ -r /sys/class/net/$BRNAME/flags ]; then for br in ${BRNAME}; do
read flags < /sys/class/net/$BRNAME/flags [ -r /sys/class/net/${br}/flags ] || { sleep 1; continue 2; }
[ $((flags & 0x1)) -eq 1 ] && { return 0; } read flags < /sys/class/net/${br}/flags
fi [ $((flags & 0x1)) -eq 1 ] || { sleep 1; continue 2; }
sleep 1 done
return 0
done done
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment