mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-01 21:15:22 +00:00
Code Issues Releases Wiki Activity

Merge git://github.com/lxc/lxc

Browse Source
This commit is contained in:
Daniel Lezcano
2012-12-14 09:42:21 +01:00
parent d984bb4e75 d2e30e99b4
commit 2a061f55f9
5 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/lxc/commands.c
View File

@@ -287,11 +287,9 @@ out_close:
goto out; goto out;
} }
extern int lxc_command_mainloop_add(const char *name, extern int lxc_command_init(const char *name, struct lxc_handler *handler)
struct lxc_epoll_descr *descr,
struct lxc_handler *handler)
{ {
int ret, fd; int fd;
char path[sizeof(((struct sockaddr_un *)0)->sun_path)] = { 0 }; char path[sizeof(((struct sockaddr_un *)0)->sun_path)] = { 0 };
char *offset = &path[1]; char *offset = &path[1];
int rc, len; int rc, len;
@@ -320,6 +318,16 @@ extern int lxc_command_mainloop_add(const char *name,
return -1; return -1;
} }
handler->conf->maincmd_fd = fd;
return 0;
}
extern int lxc_command_mainloop_add(const char *name,
struct lxc_epoll_descr *descr,
struct lxc_handler *handler)
{
int ret, fd = handler->conf->maincmd_fd;
ret = lxc_mainloop_add_handler(descr, fd, incoming_command_handler, ret = lxc_mainloop_add_handler(descr, fd, incoming_command_handler,
handler); handler);
if (ret) { if (ret) {
@@ -327,6 +335,5 @@ extern int lxc_command_mainloop_add(const char *name,
close(fd); close(fd);
} }
handler->conf->maincmd_fd = fd;
return ret; return ret;
} }

1
src/lxc/commands.h
View File

@@ -60,6 +60,7 @@ extern int lxc_command_connected(const char *name, struct lxc_command *command,
struct lxc_epoll_descr; struct lxc_epoll_descr;
struct lxc_handler; struct lxc_handler;
extern int lxc_command_init(const char *name, struct lxc_handler *handler);
extern int lxc_command_mainloop_add(const char *name, struct lxc_epoll_descr *descr, extern int lxc_command_mainloop_add(const char *name, struct lxc_epoll_descr *descr,
struct lxc_handler *handler); struct lxc_handler *handler);

1
src/lxc/conf.c
View File

@@ -1895,6 +1895,7 @@ struct lxc_conf *lxc_conf_init(void)
new->console.master = -1; new->console.master = -1;
new->console.slave = -1; new->console.slave = -1;
new->console.name[0] = '\0'; new->console.name[0] = '\0';
new->maincmd_fd = -1;
new->rootfs.mount = default_rootfs_mount; new->rootfs.mount = default_rootfs_mount;
new->loglevel = LXC_LOG_PRIORITY_NOTSET; new->loglevel = LXC_LOG_PRIORITY_NOTSET;
lxc_list_init(&new->cgroup); lxc_list_init(&new->cgroup);

3
src/lxc/lxccontainer.c
View File

@@ -381,9 +381,6 @@ reboot:
if (conf->reboot) { if (conf->reboot) {
INFO("container requested reboot"); INFO("container requested reboot");
conf->reboot = 0; conf->reboot = 0;
if (conf->maincmd_fd)
close(conf->maincmd_fd);
conf->maincmd_fd = 0;
goto reboot; goto reboot;
} }

10
src/lxc/start.c
View File

@@ -377,9 +377,12 @@ struct lxc_handler *lxc_init(const char *name, struct lxc_conf *conf)
goto out_free; goto out_free;
} }
if (lxc_command_init(name, handler))
goto out_free_name;
if (lxc_read_seccomp_config(conf) != 0) { if (lxc_read_seccomp_config(conf) != 0) {
ERROR("failed loading seccomp policy"); ERROR("failed loading seccomp policy");
goto out_free_name; goto out_close_maincmd_fd;
} }
/* Begin the set the state to STARTING*/ /* Begin the set the state to STARTING*/
@@ -421,6 +424,9 @@ out_delete_tty:
lxc_delete_tty(&conf->tty_info); lxc_delete_tty(&conf->tty_info);
out_aborting: out_aborting:
lxc_set_state(name, handler, ABORTING); lxc_set_state(name, handler, ABORTING);
out_close_maincmd_fd:
close(conf->maincmd_fd);
conf->maincmd_fd = -1;
out_free_name: out_free_name:
free(handler->name); free(handler->name);
handler->name = NULL; handler->name = NULL;
@@ -446,6 +452,8 @@ void lxc_fini(const char *name, struct lxc_handler *handler)
lxc_delete_console(&handler->conf->console); lxc_delete_console(&handler->conf->console);
lxc_delete_tty(&handler->conf->tty_info); lxc_delete_tty(&handler->conf->tty_info);
close(handler->conf->maincmd_fd);
handler->conf->maincmd_fd = -1;
free(handler->name); free(handler->name);
free(handler); free(handler);
} }