From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 19 Feb 2017 04:28:01 +0000 (-0500)
Subject: build.h: include default cgroup hierarchy setting in --version output
X-Git-Tag: v233~41^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5a94b18752befd7cfb9961cad2b5dc4415036027;p=thirdparty%2Fsystemd.git

build.h: include default cgroup hierarchy setting in --version output

This is pretty important, and we print this string during startup, so putting
the default hierarchy information might help with diagnosis if things go awry.

$ ./systemctl --version
systemd 232
+PAM +AUDIT +SELINUX +IMA -APPARMOR +SMACK +SYSVINIT +UTMP +LIBCRYPTSETUP +GCRYPT +GNUTLS +ACL +XZ +LZ4 +SECCOMP +BLKID +ELFUTILS +KMOD +IDN default-hierarchy=legacy

v2: make the message nicer by including the ./configure option argument
directly in output
---

diff --git a/configure.ac b/configure.ac
index 66ecde1a223..f671d7e1b52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -626,6 +626,8 @@ AS_CASE("$DEFAULT_HIERARCHY",
         [unified], [mode=CGROUP_UNIFIED_ALL],
         AC_MSG_ERROR(Bad default hierarchy mode ${DEFAULT_HIERARCHY}))
 AC_DEFINE_UNQUOTED(DEFAULT_HIERARCHY, [$mode], [Default cgroup hierarchy])
+AC_DEFINE_UNQUOTED(DEFAULT_HIERARCHY_NAME, ["$DEFAULT_HIERARCHY"],
+                                           [Default cgroup hierarchy as string])
 
 # ------------------------------------------------------------------------------
 have_xz=no
diff --git a/src/basic/build.h b/src/basic/build.h
index 633c2aaccb5..91312bd2a3c 100644
--- a/src/basic/build.h
+++ b/src/basic/build.h
@@ -133,6 +133,8 @@
 #define _IDN_FEATURE_ "-IDN"
 #endif
 
+#define _CGROUP_HIEARCHY_ "default-hierarchy=" DEFAULT_HIERARCHY_NAME
+
 #define SYSTEMD_FEATURES                                                \
         _PAM_FEATURE_ " "                                               \
         _AUDIT_FEATURE_ " "                                             \
@@ -152,4 +154,5 @@
         _BLKID_FEATURE_ " "                                             \
         _ELFUTILS_FEATURE_ " "                                          \
         _KMOD_FEATURE_ " "                                              \
-        _IDN_FEATURE_
+        _IDN_FEATURE_ " "                                               \
+        _CGROUP_HIEARCHY_