Unverified Commit 7c8b10e5 by Stéphane Graber Committed by GitHub

Merge pull request #3465 from brauner/2020-06-19/clone_into_cgroup

clone_into_cgroup: fixes
parents d5827bc0 0aff04e0
......@@ -1695,7 +1695,7 @@ static int lxc_spawn(struct lxc_handler *handler)
goto out_delete_net;
}
} else {
int cgroup_fd;
int cgroup_fd = -EBADF;
struct lxc_clone_args clone_args = {
.flags = handler->clone_flags,
......
......@@ -3,6 +3,8 @@
#ifndef __LXC_START_H
#define __LXC_START_H
#include <linux/sched.h>
#include <sched.h>
#include <signal.h>
#include <stdbool.h>
#include <sys/param.h>
......@@ -37,7 +39,7 @@ struct lxc_handler {
unsigned int ns_clone_flags;
unsigned int ns_on_clone_flags;
unsigned int ns_unshare_flags;
unsigned int clone_flags;
__aligned_u64 clone_flags;
};
/* File descriptor to pin the rootfs for privileged containers. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment