diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-02-18 23:28:01 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-02-20 12:45:50 -0500 |
| commit | 5a94b18752befd7cfb9961cad2b5dc4415036027 (patch) | |
| tree | 4ff34036a8dccda2107fa0f4372f661d1b1ad536 | |
| parent | 77fab2a91c801985bd8efb293319935a3cdc1dcf (diff) | |
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
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/basic/build.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 66ecde1a22..f671d7e1b5 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 633c2aaccb..91312bd2a3 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_ |