[lxc-devel] [PATCH] Fix wait_for_bridge() in sysvinit script
Robert Vogelgesang
vogel at users.sourceforge.net
Fri Apr 4 17:01:34 UTC 2014
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 at users.sourceforge.net>
diff -up lxc-1.0.2/config/init/sysvinit/lxc.fix_wfb lxc-1.0.2/config/init/sysvinit/lxc
--- lxc-1.0.2/config/init/sysvinit/lxc.fix_wfb 2014-03-27 20:10:48.000000000 +0100
+++ lxc-1.0.2/config/init/sysvinit/lxc 2014-04-04 18:35:16.608924414 +0200
@@ -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
More information about the lxc-devel
mailing list