conf: lxc_setup() -> lxc_setup_child()

Closes #1857. Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
lxc · Oct 21, 2017 · 7f13559 · 7f13559
1 parent a04220d
commit 7f13559
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/lxc/conf.c b/src/lxc/conf.c
@@ -3079,7 +3079,7 @@ static bool verify_start_hooks(struct lxc_conf *conf)
 	return true;
 }
 
-int lxc_setup(struct lxc_handler *handler)
+int lxc_setup_child(struct lxc_handler *handler)
 {
 	int ret;
 	const char *name = handler->name;

diff --git a/src/lxc/conf.h b/src/lxc/conf.h
@@ -377,7 +377,7 @@ extern int lxc_delete_autodev(struct lxc_handler *handler);
 extern void lxc_clear_includes(struct lxc_conf *conf);
 extern int do_rootfs_setup(struct lxc_conf *conf, const char *name,
 			   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 find_unmapped_nsid(struct lxc_conf *conf, enum idtype idtype);
 extern int mapped_hostid(unsigned id, struct lxc_conf *conf,

diff --git a/src/lxc/start.c b/src/lxc/start.c
@@ -937,7 +937,7 @@ static int do_start(void *data)
 	}
 
 	/* Setup the container, ip, names, utsname, ... */
-	ret = lxc_setup(handler);
+	ret = lxc_setup_child(handler);
 	close(handler->data_sock[0]);
 	close(handler->data_sock[1]);
 	if (ret < 0) {