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 77096cb5114e92036b0e237166cd309b259ec98f..c23b840dbc82922b772586409ddeac60c2611c23 100644 (file)
--- 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));