conf: lxc_setup() -> lxc_setup_child()

Closes #1857.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 3b1e422a3f8ff5b572d585a47ab619c55db08288..f6a0788c702d655fa9fa032b73a3a47576d30d46 100644 (file)
--- 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
index d89aed400cab822836107ac7e2a99f07dc767bae..d228c94c1783fbe9a5b5a6b953cdd690b6c89727 100644 (file)
--- 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
index 402bba5520a30247aa3a6ab11aec93ca9f9052c2..28ddb721f7c87a8b665673b6756f0a1523a9b9cb 100644 (file)
--- 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) {