2 files changed, 30 insertions, 0 deletions

diff --git a/recipes-containers/lxc/files/lxc-0.9.0-don-t-let-LXC_PATH-end-in-failure.patch b/recipes-containers/lxc/files/lxc-0.9.0-don-t-let-LXC_PATH-end-in-failure.patch
new file mode 100644
index 00000000..fe9f8cc5
--- /dev/null
+++ b/recipes-containers/lxc/files/lxc-0.9.0-don-t-let-LXC_PATH-end-in-failure.patch
@@ -0,0 +1,29 @@
+From fd95f2402dc70ad41fa2db8fb101f950196458a9 Mon Sep 17 00:00:00 2001
+From: Serge Hallyn <serge.hallyn@ubuntu.com>
+Date: Tue, 9 Apr 2013 16:23:05 -0500
+Subject: [PATCH] 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>
+---
+ src/lxc/lxc.functions.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lxc/lxc.functions.in b/src/lxc/lxc.functions.in
+index b41f9b8..aa5717d 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
+-- 
+1.7.11.7
+
diff --git a/recipes-containers/lxc/lxc_0.9.0.bb b/recipes-containers/lxc/lxc_0.9.0.bb
index 1cbbad04..bed7e4a1 100644
--- a/recipes-containers/lxc/lxc_0.9.0.bb
+++ b/recipes-containers/lxc/lxc_0.9.0.bb
@@ -25,6 +25,7 @@ SRC_URI = "http://lxc.sourceforge.net/download/lxc/${PN}-${PV}.tar.gz \
         file://lxc-0.9.0-disable-udhcp-from-busybox-template.patch \
         file://lxc-0.9.0-enable-chroot-chpasswd-functionality-for-busybox-hosts.patch \
     file://lxc-0.9.0-check-when-bind-mounting-libdirs.patch \
+    file://lxc-0.9.0-don-t-let-LXC_PATH-end-in-failure.patch \
         "
 SRC_URI[md5sum] = "8552a4479090616f4bc04d8473765fc9"
 SRC_URI[sha256sum] = "1e1767eae6cc5fbf892c0e193d25da420ba19f2db203716c38f7cdea3b654120"