proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-27 15:49:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

preserve container namespace

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Wolfgang Bumiller 2015-10-06 10:01:02 +02:00 committed by Stéphane Graber
parent 035a38fc93
commit b6b2b194a8
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lxc/start.c
View File

@ -379,6 +379,7 @@ out_sigfd:
struct lxc_handler *lxc_init(const char *name, struct lxc_conf *conf, const char *lxcpath) struct lxc_handler *lxc_init(const char *name, struct lxc_conf *conf, const char *lxcpath)
{ {
int i;
struct lxc_handler *handler; struct lxc_handler *handler;
handler = malloc(sizeof(*handler)); handler = malloc(sizeof(*handler));
@ -392,6 +393,9 @@ struct lxc_handler *lxc_init(const char *name, struct lxc_conf *conf, const char
handler->lxcpath = lxcpath; handler->lxcpath = lxcpath;
handler->pinfd = -1; handler->pinfd = -1;
for (i = 0; i < LXC_NS_MAX; i++)
handler->nsfd[i] = -1;
lsm_init(); lsm_init();
handler->name = strdup(name); handler->name = strdup(name);
@ -482,10 +486,19 @@ out_free:
void lxc_fini(const char *name, struct lxc_handler *handler) void lxc_fini(const char *name, struct lxc_handler *handler)
{ {
int i;
/* The STOPPING state is there for future cleanup code /* The STOPPING state is there for future cleanup code
* which can take awhile * which can take awhile
*/ */
lxc_set_state(name, handler, STOPPING); lxc_set_state(name, handler, STOPPING);
for (i = 0; i < LXC_NS_MAX; i++) {
if (handler->nsfd[i] != -1) {
close(handler->nsfd[i]);
handler->nsfd[i] = -1;
}
}
lxc_set_state(name, handler, STOPPED); lxc_set_state(name, handler, STOPPED);
if (run_lxc_hooks(name, "post-stop", handler->conf, handler->lxcpath, NULL)) if (run_lxc_hooks(name, "post-stop", handler->conf, handler->lxcpath, NULL))
@ -996,6 +1009,11 @@ static int lxc_spawn(struct lxc_handler *handler)
goto out_delete_net; goto out_delete_net;
} }
if (preserve_ns(handler->nsfd, handler->clone_flags, handler->pid) < 0) {
ERROR("failed to store namespace references");
goto out_delete_net;
}
if (attach_ns(saved_ns_fd)) if (attach_ns(saved_ns_fd))
WARN("failed to restore saved namespaces"); WARN("failed to restore saved namespaces");

1
src/lxc/start.h
View File

@ -75,6 +75,7 @@ struct lxc_handler {
void *cgroup_data; void *cgroup_data;
int ttysock[2]; // socketpair for child->parent tty fd passing int ttysock[2]; // socketpair for child->parent tty fd passing
bool backgrounded; // indicates whether should we close std{in,out,err} on start bool backgrounded; // indicates whether should we close std{in,out,err} on start
int nsfd[LXC_NS_MAX];
}; };