conf: lxc_setup() -> lxc_setup_child()

Closes #1857. Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent a04220de
...@@ -3079,7 +3079,7 @@ static bool verify_start_hooks(struct lxc_conf *conf) ...@@ -3079,7 +3079,7 @@ static bool verify_start_hooks(struct lxc_conf *conf)
return true; return true;
} }
int lxc_setup(struct lxc_handler *handler) int lxc_setup_child(struct lxc_handler *handler)
{ {
int ret; int ret;
const char *name = handler->name; const char *name = handler->name;
......
...@@ -377,7 +377,7 @@ extern int lxc_delete_autodev(struct lxc_handler *handler); ...@@ -377,7 +377,7 @@ extern int lxc_delete_autodev(struct lxc_handler *handler);
extern void lxc_clear_includes(struct lxc_conf *conf); extern void lxc_clear_includes(struct lxc_conf *conf);
extern int do_rootfs_setup(struct lxc_conf *conf, const char *name, extern int do_rootfs_setup(struct lxc_conf *conf, const char *name,
const char *lxcpath); const char *lxcpath);
extern int lxc_setup(struct lxc_handler *handler); extern int lxc_setup_child(struct lxc_handler *handler);
extern int setup_resource_limits(struct lxc_list *limits, pid_t pid); extern int setup_resource_limits(struct lxc_list *limits, pid_t pid);
extern int find_unmapped_nsid(struct lxc_conf *conf, enum idtype idtype); extern int find_unmapped_nsid(struct lxc_conf *conf, enum idtype idtype);
extern int mapped_hostid(unsigned id, struct lxc_conf *conf, extern int mapped_hostid(unsigned id, struct lxc_conf *conf,
......
...@@ -937,7 +937,7 @@ static int do_start(void *data) ...@@ -937,7 +937,7 @@ static int do_start(void *data)
} }
/* Setup the container, ip, names, utsname, ... */ /* Setup the container, ip, names, utsname, ... */
ret = lxc_setup(handler); ret = lxc_setup_child(handler);
close(handler->data_sock[0]); close(handler->data_sock[0]);
close(handler->data_sock[1]); close(handler->data_sock[1]);
if (ret < 0) { if (ret < 0) {
......
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