From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Tue, 9 Apr 2013 21:23:05 +0000 (-0500)
Subject: lxc.functions: don't let LXC_PATH= line end in failure
X-Git-Tag: lxc-1.0.0.alpha1~1^2~324
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd95f2402dc70ad41fa2db8fb101f950196458a9;p=thirdparty%2Flxc.git

lxc.functions: don't let LXC_PATH= line end in failure

Otherwise if called from dash with set -e, dash will exit.  This
causes lxc-clone to fail.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/lxc.functions.in b/src/lxc/lxc.functions.in
index b41f9b899..aa5717d0b 100644
--- a/src/lxc/lxc.functions.in
+++ b/src/lxc/lxc.functions.in
@@ -26,7 +26,7 @@ templatedir=@LXCTEMPLATEDIR@
 lxcinitdir=@LXCINITDIR@
 
 get_default_lxcpath() {
-	LXC_PATH=$(grep -v "^#" "$globalconf" 2>/dev/null | grep "[ \t]*lxcpath[ \t]*=")
+	LXC_PATH=$(grep -v "^#" "$globalconf" 2>/dev/null | grep "[ \t]*lxcpath[ \t]*=") || true
 	if [ -n "$LXC_PATH" ]; then
 		echo $LXC_PATH | awk -F= '{ print $2 }'
 	else