console: lxc_terminal_map_ids()

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

diff --git a/src/lxc/attach.c b/src/lxc/attach.c
index e389c58532852ccf3f5fc6276e883fd96eb5d59a..4e5bbfdb80198918b5ed37f21364c52fc7ff4ffa 100644 (file)
--- a/src/lxc/attach.c
+++ b/src/lxc/attach.c
@@ -987,7 +987,7 @@ static int lxc_attach_pty(struct lxc_conf *conf, struct lxc_pty *pty)
        }
 
        /* Shift ttys to container. */
-       ret = lxc_pty_map_ids(conf, pty);
+       ret = lxc_terminal_map_ids(conf, pty);
        if (ret < 0) {
                ERROR("Failed to shift pty");
                goto on_error;

diff --git a/src/lxc/console.c b/src/lxc/console.c
index b3e91226ae932d3cb91d8282418982bc7292f265..872d55e80024925708203bfc95675e98ada16a5f 100644 (file)
--- a/src/lxc/console.c
+++ b/src/lxc/console.c
@@ -1154,7 +1154,7 @@ void lxc_terminal_conf_free(struct lxc_pty *terminal)
                lxc_ringbuf_release(&terminal->ringbuf);
 }
 
-int lxc_pty_map_ids(struct lxc_conf *c, struct lxc_pty *pty)
+int lxc_terminal_map_ids(struct lxc_conf *c, struct lxc_pty *pty)
 {
        int ret;
 

diff --git a/src/lxc/console.h b/src/lxc/console.h
index 5893570fd2e70b2765986d589ed682317ddfcc4c..81d882a6ab63efaeac83305353f5e99cfef1e2b8 100644 (file)
--- a/src/lxc/console.h
+++ b/src/lxc/console.h
@@ -237,6 +237,6 @@ extern int lxc_login_pty(int fd);
 extern void lxc_terminal_conf_free(struct lxc_pty *console);
 extern void lxc_terminal_info_init(struct lxc_pty_info *pty);
 extern void lxc_terminal_init(struct lxc_pty *pty);
-extern int lxc_pty_map_ids(struct lxc_conf *c, struct lxc_pty *pty);
+extern int lxc_terminal_map_ids(struct lxc_conf *c, struct lxc_pty *pty);
 
 #endif

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 08abb00baf2c3ad8881f1b81cbc00116b3dff262..fcb3280af843a590393a0bdd35b76ea236d02980 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -811,7 +811,7 @@ int lxc_init(const char *name, struct lxc_handler *handler)
        }
        TRACE("Created console");
 
-       ret = lxc_pty_map_ids(conf, &conf->console);
+       ret = lxc_terminal_map_ids(conf, &conf->console);
        if (ret < 0) {
                ERROR("Failed to chown console");
                goto out_restore_sigmask;