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 ac24b10ddd7f158bf2d66271292f5c9b44f0e0b3..dde874a7aeefbe619b5389ecc1a5451f5b669ba5 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -3078,7 +3078,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 946ae4a2376aeca192479f50ebbc9efec6872e7a..7abb5740fec9d88bf5c222ac57841d560f1c17f0 100644 (file)
--- a/src/lxc/conf.h
+++ b/src/lxc/conf.h
@@ -372,7 +372,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 a6a40c727f48d2e1aea4324da0a12a19e7d725bd..cec7279669b0fe16557b65ff43c3871fa81edc37 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) {