From: Robert Vogelgesang <vogel@users.sourceforge.net>
Date: Fri, 4 Apr 2014 17:01:34 +0000 (+0200)
Subject: Fix wait_for_bridge() in sysvinit script
X-Git-Tag: lxc-1.1.0.alpha1~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d3bc9ed7b8e2f017d2b9adcb7fb522f5943e748;p=thirdparty%2Flxc.git

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>
---

diff --git a/config/init/sysvinit/lxc b/config/init/sysvinit/lxc
index 436eef488..5ab3c4656 100755
--- 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