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.3~53
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=9c8e68cc8a0ca303273e931fb4c042af7ed89a73

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
elogind 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/src/basic/build.h b/src/basic/build.h
index 856519f61..d37610738 100644
--- a/src/basic/build.h
+++ b/src/basic/build.h
@@ -43,8 +43,11 @@
 #define _ACL_FEATURE_ "-ACL"
 #endif
 
+#define _CGROUP_HIEARCHY_ "default-hierarchy=" DEFAULT_HIERARCHY_NAME
+
 #define SYSTEMD_FEATURES                                                \
         _PAM_FEATURE_ " "                                               \
         _SELINUX_FEATURE_ " "                                           \
         _SMACK_FEATURE_ " "                                             \
-        _ACL_FEATURE_ " "
+        _ACL_FEATURE_ " "                                               \
+        _CGROUP_HIEARCHY_