conf: s/lxc_rootfs_prepare/lxc_rootfs_init/g

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

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 44aa8ba4aa2b6f6a2ea505cfa377c7413c113dab..195fa4940c19ae37ba65abc1ec744588c15a73c5 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -527,7 +527,7 @@ void lxc_storage_put(struct lxc_conf *conf)
  * no name pollution is happens.
  * don't unlink on NFS to avoid random named stale handles.
  */
-int lxc_rootfs_prepare(struct lxc_conf *conf, bool userns)
+int lxc_rootfs_init(struct lxc_conf *conf, bool userns)
 {
        __do_close int dfd_path = -EBADF, fd_pin = -EBADF, fd_userns = -EBADF;
        int ret;

diff --git a/src/lxc/conf.h b/src/lxc/conf.h
index 3a787948578fce654b28b8880013626381a81c2d..fe70f5bf453836eb107512196d4ae96cd40ff8ee 100644 (file)
--- a/src/lxc/conf.h
+++ b/src/lxc/conf.h
@@ -505,6 +505,7 @@ __hidden extern void lxc_conf_free(struct lxc_conf *conf);
 __hidden extern int lxc_storage_prepare(struct lxc_conf *conf);
 __hidden extern int lxc_rootfs_prepare(struct lxc_conf *conf, bool userns);
 __hidden extern void lxc_storage_put(struct lxc_conf *conf);
+__hidden extern int lxc_rootfs_init(struct lxc_conf *conf, bool userns);
 __hidden extern int lxc_map_ids(struct lxc_list *idmap, pid_t pid);
 __hidden extern int lxc_create_tty(const char *name, struct lxc_conf *conf);
 __hidden extern void lxc_delete_tty(struct lxc_tty_info *ttys);

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 070cae712a9c94ddf0b7c1c7cde4eb6c777d964c..a18ac1bd2129775d000871105bd7cef4fac9b3f8 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -2034,7 +2034,7 @@ int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops,
         * it readonly.
         * If the container is unprivileged then skip rootfs pinning.
         */
-       ret = lxc_rootfs_prepare(conf, !lxc_list_empty(&conf->id_map));
+       ret = lxc_rootfs_init(conf, !lxc_list_empty(&conf->id_map));
        if (ret) {
                ERROR("Failed to handle rootfs pinning for container \"%s\"", handler->name);
                ret = -1;