5
0
mirror of git://git.proxmox.com/git/lxc.git synced 2025-03-22 06:50:41 +03:00

remove patch which has gone upstream

This commit is contained in:
Wolfgang Bumiller 2017-02-09 13:26:48 +01:00
parent 30da3479ce
commit 790ed80040
2 changed files with 0 additions and 33 deletions

View File

@ -1,32 +0,0 @@
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

View File

@ -5,5 +5,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
rename-cgns-subdir-to-ns.patch