proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-14 15:29:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2049 from brauner/2017-12-18/start_reap_attacher_process

Browse Source 
start: reap intermediate process
This commit is contained in:
Serge Hallyn 2017-12-18 10:49:50 -06:00 committed by GitHub
commit 9668d2cd15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lxc/error.h
View File

@ -23,6 +23,8 @@
#ifndef __LXC_ERROR_H #ifndef __LXC_ERROR_H
#define __LXC_ERROR_H #define __LXC_ERROR_H
#define LXC_CLONE_ERROR "Failed to clone a new set of namespaces"
extern int lxc_error_set_and_log(int pid, int status); extern int lxc_error_set_and_log(int pid, int status);
#endif #endif

24
src/lxc/start.c
View File

@ -1399,14 +1399,28 @@ static int lxc_spawn(struct lxc_handler *handler)
/* The cgroup namespace gets unshare()ed not clone()ed. */ /* The cgroup namespace gets unshare()ed not clone()ed. */
handler->on_clone_flags &= ~CLONE_NEWCGROUP; handler->on_clone_flags &= ~CLONE_NEWCGROUP;
if (share_ns) if (share_ns) {
ret = lxc_clone(do_share_ns, handler, CLONE_VFORK | CLONE_VM | CLONE_FILES); pid_t attacher_pid;
else
attacher_pid = lxc_clone(do_share_ns, handler, CLONE_VFORK | CLONE_VM | CLONE_FILES);
if (attacher_pid < 0) {
SYSERROR(LXC_CLONE_ERROR);
goto out_delete_net;
}
ret = wait_for_pid(attacher_pid);
if (ret < 0) {
SYSERROR("Intermediate process failed");
goto out_delete_net;
}
} else {
handler->pid = lxc_clone(do_start, handler, handler->on_clone_flags); handler->pid = lxc_clone(do_start, handler, handler->on_clone_flags);
if (handler->pid < 0 || ret < 0) { }
SYSERROR("Failed to clone a new set of namespaces."); if (handler->pid < 0) {
SYSERROR(LXC_CLONE_ERROR);
goto out_delete_net; goto out_delete_net;
} }
TRACE("Cloned child process %d", handler->pid); TRACE("Cloned child process %d", handler->pid);
for (i = 0; i < LXC_NS_MAX; i++) for (i = 0; i < LXC_NS_MAX; i++)