From dc513d78a87d58e75d3fd37131f6aa47f5c587a7 Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Sat, 18 Mar 2017 10:09:24 -0700
Subject: [PATCH] systemd: use recommended default hybrid cgroups hierarchy

---
 packages/sysutils/systemd/package.mk          |  3 +-
 ...he-unified-hierarchy-for-cgroups-yet.patch | 36 -------------------
 2 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 packages/sysutils/systemd/patches/systemd-0006-dont-use-the-unified-hierarchy-for-cgroups-yet.patch

diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk
index b03973821c..713a21887e 100644
--- a/packages/sysutils/systemd/package.mk
+++ b/packages/sysutils/systemd/package.mk
@@ -103,7 +103,8 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            --with-dbussessionservicedir=/usr/share/dbus-1/services \
                            --with-dbussystemservicedir=/usr/share/dbus-1/system-services \
                            --with-rootprefix=/usr \
-                           --with-rootlibdir=/usr/lib"
+                           --with-rootlibdir=/usr/lib \
+                           --with-default-hierarchy=hybrid"
 
 pre_build_target() {
 # broken autoreconf
diff --git a/packages/sysutils/systemd/patches/systemd-0006-dont-use-the-unified-hierarchy-for-cgroups-yet.patch b/packages/sysutils/systemd/patches/systemd-0006-dont-use-the-unified-hierarchy-for-cgroups-yet.patch
deleted file mode 100644
index 65cd229655..0000000000
--- a/packages/sysutils/systemd/patches/systemd-0006-dont-use-the-unified-hierarchy-for-cgroups-yet.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From e3d9d7d770e4d7b61ad3b4c156e0d30894c30aac Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Wed, 9 Nov 2016 08:43:57 +0100
-Subject: [PATCH] core: don't use the unified hierarchy for the systemd cgroup
- yet
-
-Too many things don't get along with the unified hierarchy yet:
-
- * https://github.com/opencontainers/runc/issues/1175
- * https://github.com/docker/docker/issues/28109
- * https://github.com/lxc/lxc/issues/1280
-
-So revert the default to the legacy hierarchy for now. Developers of the above
-software can opt into the unified hierarchy with
-"systemd.legacy_systemd_cgroup_controller=0".
----
- src/basic/cgroup-util.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
-index 5e73753..dc13025 100644
---- a/src/basic/cgroup-util.c
-+++ b/src/basic/cgroup-util.c
-@@ -2423,10 +2423,10 @@ bool cg_is_unified_systemd_controller_wanted(void) {
- 
-                 r = get_proc_cmdline_key("systemd.legacy_systemd_cgroup_controller=", &value);
-                 if (r < 0)
--                        return true;
-+                        return false;
- 
-                 if (r == 0)
--                        wanted = true;
-+                        wanted = false;
-                 else
-                         wanted = parse_boolean(value) <= 0;
-         }