From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Fri, 2 Dec 2016 13:17:20 +0000 (+0100)
Subject: merge: tools: lxc-start: set configfile after load_config
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9cbc07f09a5d710d2107969b5df4847b7c1cd311;p=lxc.git

merge: tools: lxc-start: set configfile after load_config
---

diff --git a/debian/patches/lxc-start-configfile.patch b/debian/patches/lxc-start-configfile.patch
new file mode 100644
index 0000000..55f4939
--- /dev/null
+++ b/debian/patches/lxc-start-configfile.patch
@@ -0,0 +1,32 @@
+From b586db430b5eb2c8212f5e95fca49b78657f6edb Mon Sep 17 00:00:00 2001
+From: Wolfgang Bumiller <w.bumiller@proxmox.com>
+Date: Fri, 2 Dec 2016 14:15:40 +0100
+Subject: [PATCH] tools: lxc-start: set configfile after load_config
+
+Same change as in 6118210e0a which was missing in lxc-start
+and back then is_defined() wasn't being called.
+
+Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
+---
+ src/lxc/tools/lxc_start.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/lxc/tools/lxc_start.c b/src/lxc/tools/lxc_start.c
+index 984a28f..c85305b 100644
+--- a/src/lxc/tools/lxc_start.c
++++ b/src/lxc/tools/lxc_start.c
+@@ -259,6 +259,11 @@ int main(int argc, char *argv[])
+ 			lxc_container_put(c);
+ 			exit(err);
+ 		}
++		c->configfile = strdup(my_args.rcfile);
++		if (!c->configfile) {
++			ERROR("Out of memory setting new config filename");
++			goto out;
++		}
+ 	} else {
+ 		int rc;
+ 
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index c4f6813..272d89b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ run-lxcnetaddbr.patch
 deny-rw-mounting-of-sys-and-proc.patch
 0001-separate-the-limiting-from-the-namespaced-cgroup-roo.patch
 0002-start-initutils-make-cgroupns-separation-level-confi.patch
+lxc-start-configfile.patch