From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 25 May 2022 12:04:13 +0000 (+0000)
Subject: execute: Make CLONE_INTO_CGROUP non-optional
X-Git-Tag: 0.9.28~757
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d134e4d83d5500bd1e219ddf3680de3d57b2523;p=pakfire.git

execute: Make CLONE_INTO_CGROUP non-optional

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/execute.c b/src/libpakfire/execute.c
index 77096cb51..c23b840db 100644
--- a/src/libpakfire/execute.c
+++ b/src/libpakfire/execute.c
@@ -713,7 +713,8 @@ PAKFIRE_EXPORT int pakfire_execute(struct pakfire* pakfire, const char* argv[],
 			CLONE_NEWIPC |
 			CLONE_NEWNS |
 			CLONE_NEWPID |
-			CLONE_NEWUTS,
+			CLONE_NEWUTS |
+			CLONE_INTO_CGROUP,
 		.exit_signal = SIGCHLD,
 	};
 
@@ -799,10 +800,8 @@ PAKFIRE_EXPORT int pakfire_execute(struct pakfire* pakfire, const char* argv[],
 		goto ERROR;
 	}
 
-#ifdef CLONE_INTO_CGROUP
-	args.flags |= CLONE_INTO_CGROUP;
+	// Clone into this cgroup
 	args.cgroup = dirfd(cgroupdir);
-#endif
 
 	// Fork this process
 	pid_t pid = syscall(__NR_clone3, &args, sizeof(args));