remove patch which has gone upstream

diff --git a/debian/patches/lxc-start-configfile.patch b/debian/patches/lxc-start-configfile.patch
deleted file mode 100644 (file)
index 55f4939..0000000
--- a/debian/patches/lxc-start-configfile.patch
+++ /dev/null
@@ -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
-

diff --git a/debian/patches/series b/debian/patches/series
index 3ab159a06113a0757da35b97c1c42d47020c3c1d..a5d0c356824ef38aed2b9bec6aa15aadc28ea6d9 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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