update to lxc-4.0.6

[lxc.git] / debian / patches / pve / 0010-cgroups-adhere-to-boolean-return.patch

diff --git a/debian/patches/pve/0010-cgroups-adhere-to-boolean-return.patch b/debian/patches/pve/0010-cgroups-adhere-to-boolean-return.patch
deleted file mode 100644 (file)
index 5bf3fe2..0000000
--- a/debian/patches/pve/0010-cgroups-adhere-to-boolean-return.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Christian Brauner <christian.brauner@ubuntu.com>
-Date: Mon, 13 Apr 2020 14:39:18 +0200
-Subject: [PATCH] cgroups: adhere to boolean return
-
-Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
----
- src/lxc/cgroups/cgfsng.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
-index 603940683..6c64c996c 100644
---- a/src/lxc/cgroups/cgfsng.c
-+++ b/src/lxc/cgroups/cgfsng.c
-@@ -1196,11 +1196,9 @@ static bool cgroup_tree_create(struct cgroup_ops *ops, struct lxc_conf *conf,
-                * line, which is not possible once a subdirectory has been
-                * created.
-                */
--              if (string_in_list(h->controllers, "devices")) {
--                      ret = ops->setup_limits_legacy(ops, conf, true);
--                      if (ret < 0)
--                              return ret;
--              }
-+              if (string_in_list(h->controllers, "devices") &&
-+                  !ops->setup_limits_legacy(ops, conf, true))
-+                      return log_error(false, "Failed to setup legacy device limits");
-       }
- 
-       ret = mkdir_eexist_on_last(path, 0755);