From: Kamalesh Babulal Date: Thu, 23 Nov 2023 08:48:50 +0000 (+0530) Subject: tools/cgxset: guard systemd default delegate slice X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7d3f855495975e47eaee281f60f1a9951ba6a61;p=thirdparty%2Flibcgroup.git tools/cgxset: guard systemd default delegate slice Guard setting default systemd delegate slice with WITH_SYSTEMD, to limit the systemd delegation only to --enable-systemd=yes only. Signed-off-by: Kamalesh Babulal Signed-off-by: Tom Hromatka (cherry picked from commit 44676c56ce132a6f43180eec92fbf70349307926) --- diff --git a/src/tools/cgxset.c b/src/tools/cgxset.c index e5eba528..1c64ff54 100644 --- a/src/tools/cgxset.c +++ b/src/tools/cgxset.c @@ -146,7 +146,9 @@ err: #ifndef UNIT_TEST int main(int argc, char *argv[]) { +#ifdef WITH_SYSTEMD int ignore_default_systemd_delegate_slice = 0; +#endif struct control_value *name_value = NULL; int nv_number = 0; int nv_max = 0; @@ -255,9 +257,10 @@ int main(int argc, char *argv[]) goto err; } - /* this is false always for disable-systemd */ +#ifdef WITH_SYSTEMD if (!ignore_default_systemd_delegate_slice) cgroup_set_default_systemd_cgroup(); +#endif /* copy the name-value pairs from -r options */ if ((flags & FL_RULES) != 0) {