From: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Date: Fri, 17 Nov 2023 08:42:26 +0000 (+0530)
Subject: tools/cgcreate: guard systemd default delegate slice
X-Git-Tag: v3.2.0~173
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b34789339f52c300bd188f2e1258a7c1e8a8869;p=thirdparty%2Flibcgroup.git

tools/cgcreate: 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 <kamalesh.babulal@oracle.com>
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
---

diff --git a/src/tools/cgcreate.c b/src/tools/cgcreate.c
index f5aa7480..705d0438 100644
--- a/src/tools/cgcreate.c
+++ b/src/tools/cgcreate.c
@@ -133,7 +133,9 @@ int main(int argc, char *argv[])
 	uid_t tuid = CGRULE_INVALID, auid = CGRULE_INVALID;
 	gid_t tgid = CGRULE_INVALID, agid = CGRULE_INVALID;
 
+#ifdef WITH_SYSTEMD
 	int ignore_default_systemd_delegate_slice = 0;
+#endif
 	int set_default_scope = 0;
 	int create_scope = 0;
 	pid_t scope_pid = -1;
@@ -276,9 +278,10 @@ int main(int argc, char *argv[])
 		goto err;
 	}
 
-	/* this will always be false if WITH_SYSTEMD is not defined */
+#ifdef WITH_SYSTEMD
 	if (!create_scope && !ignore_default_systemd_delegate_slice)
 		cgroup_set_default_systemd_cgroup();
+#endif
 
 	/* for each new cgroup */
 	for (i = 0; i < capacity; i++) {