Fix wait_for_bridge() in sysvinit script

Fix parsing of /etc/lxc/default.conf, i. e. ignore comments, and don't require whitespace left and right of the equal sign. Make the early return actually work. Signed-off-by: Robert Vogelgesang <vogel@users.sourceforge.net> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

Fix wait_for_bridge() in sysvinit script
be1d88e6 · Robert Vogelgesang · Stéphane Graber · 5291ed9e · be1d88e6
Commit be1d88e6 authored Apr 04, 2014 by Robert Vogelgesang Committed by Stéphane Graber Apr 04, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

lxc config/init/sysvinit/lxc +4 -2

No files found.
--- a/config/init/sysvinit/lxc
+++ b/config/init/sysvinit/lxc
@@ -27,8 +27,10 @@ wait_for_bridge()
 {
    [ -f /etc/lxc/default.conf ] || { return 0; }

-    BRNAME=`grep lxc.network.link /etc/lxc/default.conf |awk '{print $3}'`
-    [ -n $BRNAME ] || { return 0; }
+    BRNAME=`grep '^[ 	]*lxc.network.link' /etc/lxc/default.conf | sed 's/^.*=[ 	]*//'`
+    if [ -z "$BRNAME" ]; then
+	return 0
+    fi

    for try in `seq 1 30`; do
 	ifconfig -a |grep "^$BRNAME" >/dev/null 2>&1