From 2f835b4b72ac5f7378223caaf1ca196804b3c7b1 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Tue, 27 Feb 2018 17:15:06 +0100 Subject: [PATCH] console: lxc_terminal_map_ids() Signed-off-by: Christian Brauner --- src/lxc/attach.c | 2 +- src/lxc/console.c | 2 +- src/lxc/console.h | 2 +- src/lxc/start.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lxc/attach.c b/src/lxc/attach.c index e389c5853..4e5bbfdb8 100644 --- 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 b3e91226a..872d55e80 100644 --- 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 5893570fd..81d882a6a 100644 --- 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 08abb00ba..fcb3280af 100644 --- 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; -- 2.47.2