From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Tue, 27 Feb 2018 15:51:40 +0000 (+0100)
Subject: console: lxc_terminal_create()
X-Git-Tag: lxc-3.0.0.beta1~5^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=548029fa07d455e0c67da5b589266a96b2a9590d;p=thirdparty%2Flxc.git

console: lxc_terminal_create()

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

diff --git a/src/lxc/console.c b/src/lxc/console.c
index d2a3698d1..225f27445 100644
--- a/src/lxc/console.c
+++ b/src/lxc/console.c
@@ -874,7 +874,7 @@ err:
 	return -ENODEV;
 }
 
-int lxc_console_create(struct lxc_conf *conf)
+int lxc_terminal_create(struct lxc_conf *conf)
 {
 	int ret;
 	struct lxc_pty *console = &conf->console;
diff --git a/src/lxc/console.h b/src/lxc/console.h
index 617a9b178..09b138778 100644
--- a/src/lxc/console.h
+++ b/src/lxc/console.h
@@ -85,15 +85,15 @@ extern int  lxc_terminal_allocate(struct lxc_conf *conf, int sockfd, int *ttynum
 extern int lxc_pty_create(struct lxc_pty *console);
 
 /**
- * lxc_console_create: Create a new pty.
+ * lxc_terminal_create: Create a new pty.
  * - In addition to lxc_pty_create() also sets up all pty logs.
  */
-extern int  lxc_console_create(struct lxc_conf *);
+extern int  lxc_terminal_create(struct lxc_conf *);
 
 /*
- * Delete a pty created via lxc_console_create():
+ * Delete a pty created via lxc_terminal_create():
  * - set old terminal settings
- * - memory allocated via lxc_console_create() is free()ed.
+ * - memory allocated via lxc_terminal_create() is free()ed.
  * - close master/slave pty pair and allocated fd for the peer (usually
  *   /dev/tty)
  * Registered handlers in a mainloop are not automatically deleted.
diff --git a/src/lxc/start.c b/src/lxc/start.c
index e28d3faee..579da8cbe 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -804,7 +804,7 @@ int lxc_init(const char *name, struct lxc_handler *handler)
 	TRACE("Set up signal fd");
 
 	/* Do this after setting up signals since it might unblock SIGWINCH. */
-	ret = lxc_console_create(conf);
+	ret = lxc_terminal_create(conf);
 	if (ret < 0) {
 		ERROR("Failed to create console");
 		goto out_restore_sigmask;
@@ -1198,7 +1198,7 @@ static int do_start(void *data)
 	/* Some init's such as busybox will set sane tty settings on stdin,
 	 * stdout, stderr which it thinks is the console. We already set them
 	 * the way we wanted on the real terminal, and we want init to do its
-	 * setup on its console ie. the pty allocated in lxc_console_create() so
+	 * setup on its console ie. the pty allocated in lxc_terminal_create() so
 	 * make sure that that pty is stdin,stdout,stderr.
 	 */
 	 if (handler->conf->console.slave >= 0) {