From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 19 Feb 2017 05:09:31 +0000 (-0500)
Subject: build-sys: default to hybrid cgroup hierarchy
X-Git-Tag: v233~41^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f98220a22ff0c48805ae636a380571a177824500;p=thirdparty%2Fsystemd.git

build-sys: default to hybrid cgroup hierarchy

It is expected that general-purpose distributions might want to override this.
This commit is made separate from grandparent to make it easy to revert if
needed.

v2:
- use hybrid as the default
  (We tested that the default of unified seems boot correctly everywhere and behave
   correctly in general, but it is incompatible with docker/lxc and probably some
   other tools, so for now we default to hybrid. The new "hybrid" mode should work
   be OK for those tools.)

Fixes #4669.
---

diff --git a/configure.ac b/configure.ac
index f671d7e1b52..eff7fbb2914 100644
--- a/configure.ac
+++ b/configure.ac
@@ -616,9 +616,9 @@ AC_DEFINE_UNQUOTED(FALLBACK_HOSTNAME, ["$FALLBACK_HOSTNAME"], [The hostname used
 
 AC_ARG_WITH(default-hierarchy,
         AS_HELP_STRING([--with-default-hierarchy=MODE],
-                [default cgroup hierarchy, defaults to "legacy"]),
+                [default cgroup hierarchy, defaults to "hybrid"]),
         [DEFAULT_HIERARCHY="$withval"],
-        [DEFAULT_HIERARCHY="legacy"])
+        [DEFAULT_HIERARCHY="hybrid"])
 
 AS_CASE("$DEFAULT_HIERARCHY",
         [legacy], [mode=CGROUP_UNIFIED_NONE],