Drop cgroup-don-t-trim-cgroup-trees-created-by-someone-el.patch

The patch is no longer necessary as lxc.service now uses Delegate=yes.

diff --git a/debian/patches/debian/cgroup-don-t-trim-cgroup-trees-created-by-someone-el.patch b/debian/patches/debian/cgroup-don-t-trim-cgroup-trees-created-by-someone-el.patch
deleted file mode 100644 (file)
index f9aa976..0000000
--- a/debian/patches/debian/cgroup-don-t-trim-cgroup-trees-created-by-someone-el.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Michal Sekletar <msekleta@redhat.com>
-Date: Fri, 19 Sep 2014 17:14:10 +0200
-Subject: cgroup: don't trim cgroup trees created by someone else
-
-In cases when there is a cgroup tree in a controller hierarchy which was
-not created by us, but it looks like it was (i.e. cgroup path is the
-same as the one in systemd's named hierarchy) we shouldn't delete it.
-
-Origin: http://lists.freedesktop.org/archives/systemd-devel/2014-September/023276.html
-Bug-Debian: https://bugs.debian.org/777601
----
- src/basic/cgroup-util.c | 2 --
- src/core/cgroup.c       | 2 +-
- 2 files changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
-index 038ece4..1d20bb5 100644
---- a/src/basic/cgroup-util.c
-+++ b/src/basic/cgroup-util.c
-@@ -2135,8 +2135,6 @@ int cg_create_everywhere(CGroupMask supported, CGroupMask mask, const char *path
- 
-                 if (mask & bit)
-                         (void) cg_create(n, path);
--                else if (supported & bit)
--                        (void) cg_trim(n, path, true);
-         }
- 
-         return created;
-diff --git a/src/core/cgroup.c b/src/core/cgroup.c
-index bb02436..1b695c6 100644
---- a/src/core/cgroup.c
-+++ b/src/core/cgroup.c
-@@ -1858,7 +1858,7 @@ void unit_prune_cgroup(Unit *u) {
- 
-         is_root_slice = unit_has_name(u, SPECIAL_ROOT_SLICE);
- 
--        r = cg_trim_everywhere(u->manager->cgroup_supported, u->cgroup_path, !is_root_slice);
-+        r = cg_trim_everywhere(u->cgroup_realized_mask, u->cgroup_path, !is_root_slice);
-         if (r < 0) {
-                 log_unit_debug_errno(u, r, "Failed to destroy cgroup %s, ignoring: %m", u->cgroup_path);
-                 return;

diff --git a/debian/patches/series b/debian/patches/series
index e0f7c296263e7c53eb1fd025604de6622302f5bd..4fdc962482f24d4f38130a4a4ca6c98a5dde672f 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -42,7 +42,6 @@ debian/Add-support-for-TuxOnIce-hibernation.patch
 debian/Re-enable-journal-forwarding-to-syslog.patch
 debian/Don-t-enable-audit-by-default.patch
 debian/Only-start-logind-if-dbus-is-installed.patch
-debian/cgroup-don-t-trim-cgroup-trees-created-by-someone-el.patch
 debian/fsckd-daemon-for-inter-fsckd-communication.patch
 debian/Skip-filesystem-check-if-already-done-by-the-initram.patch
 debian/Revert-core-one-step-back-again-for-nspawn-we-actual.patch