From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Tue, 27 Feb 2018 17:31:31 +0000 (+0100)
Subject: tree-wide: console.<c,h> -> terminal.<c,h>
X-Git-Tag: lxc-3.0.0.beta1~5^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ed9b1bc5ccad490807e19c9e71df3abb6380655;p=thirdparty%2Flxc.git

tree-wide: console.<c,h> -> terminal.<c,h>

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

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index ba41e7340..fb799c8db 100644
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -26,7 +26,6 @@ noinst_HEADERS = \
 	conf.h \
 	confile.h \
 	confile_utils.h \
-	console.h \
 	error.h \
 	initutils.h \
 	list.h \
@@ -37,6 +36,7 @@ noinst_HEADERS = \
 	namespace.h \
 	start.h \
 	state.h \
+	terminal.h \
 	utils.h \
 	criu.h \
 	../tests/lxctest.h
@@ -100,7 +100,7 @@ liblxc_la_SOURCES = \
 	start.c start.h \
 	execute.c \
 	monitor.c monitor.h \
-	console.c \
+	terminal.c \
 	freezer.c \
 	error.h error.c \
 	parse.c parse.h \
diff --git a/src/lxc/attach.c b/src/lxc/attach.c
index 919fa17e6..243c91c65 100644
--- a/src/lxc/attach.c
+++ b/src/lxc/attach.c
@@ -61,13 +61,13 @@
 #include "conf.h"
 #include "config.h"
 #include "confile.h"
-#include "console.h"
 #include "log.h"
 #include "lsm/lsm.h"
 #include "lxclock.h"
 #include "lxcseccomp.h"
 #include "mainloop.h"
 #include "namespace.h"
+#include "terminal.h"
 #include "utils.h"
 
 #if HAVE_SYS_PERSONALITY_H
diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index 9e6be55db..54e9f75c5 100644
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -42,13 +42,13 @@
 #include "commands_utils.h"
 #include "conf.h"
 #include "confile.h"
-#include "console.h"
 #include "log.h"
 #include "lxc.h"
 #include "lxclock.h"
 #include "mainloop.h"
 #include "monitor.h"
 #include "start.h"
+#include "terminal.h"
 #include "utils.h"
 
 /*
diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 1c6742ca1..9ab400e74 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -73,9 +73,9 @@
 #include "cgroup.h"
 #include "conf.h"
 #include "confile_utils.h"
-#include "console.h"
 #include "error.h"
 #include "log.h"
+#include "lsm/lsm.h"
 #include "lxclock.h"
 #include "lxcseccomp.h"
 #include "namespace.h"
@@ -85,8 +85,8 @@
 #include "storage.h"
 #include "storage/aufs.h"
 #include "storage/overlay.h"
+#include "terminal.h"
 #include "utils.h"
-#include "lsm/lsm.h"
 
 #if HAVE_LIBCAP
 #include <sys/capability.h>
diff --git a/src/lxc/conf.h b/src/lxc/conf.h
index 6accce685..351059c94 100644
--- a/src/lxc/conf.h
+++ b/src/lxc/conf.h
@@ -35,10 +35,10 @@
 #endif
 #include <stdbool.h>
 
-#include "console.h"
 #include "list.h"
 #include "ringbuf.h"
 #include "start.h" /* for lxc_handler */
+#include "terminal.h"
 
 #if HAVE_SCMP_FILTER_CTX
 typedef void * scmp_filter_ctx;
diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index fb82707c4..ede0be58f 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -47,7 +47,6 @@
 #include "commands_utils.h"
 #include "confile.h"
 #include "confile_utils.h"
-#include "console.h"
 #include "criu.h"
 #include "error.h"
 #include "initutils.h"
@@ -66,6 +65,7 @@
 #include "storage/btrfs.h"
 #include "storage/overlay.h"
 #include "sync.h"
+#include "terminal.h"
 #include "utils.h"
 #include "version.h"
 
diff --git a/src/lxc/start.c b/src/lxc/start.c
index bc8067e8f..eb7331f8a 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -71,9 +71,9 @@
 #include "commands_utils.h"
 #include "conf.h"
 #include "confile_utils.h"
-#include "console.h"
 #include "error.h"
 #include "list.h"
+#include "lsm/lsm.h"
 #include "log.h"
 #include "lxccontainer.h"
 #include "lxclock.h"
@@ -83,11 +83,11 @@
 #include "namespace.h"
 #include "network.h"
 #include "start.h"
-#include "sync.h"
-#include "utils.h"
-#include "lsm/lsm.h"
 #include "storage/storage.h"
 #include "storage/storage_utils.h"
+#include "sync.h"
+#include "terminal.h"
+#include "utils.h"
 
 lxc_log_define(lxc_start, lxc);
 
diff --git a/src/lxc/console.c b/src/lxc/terminal.c
similarity index 99%
rename from src/lxc/console.c
rename to src/lxc/terminal.c
index 672318545..05a524606 100644
--- a/src/lxc/console.c
+++ b/src/lxc/terminal.c
@@ -38,11 +38,11 @@
 #include "commands.h"
 #include "conf.h"
 #include "config.h"
-#include "console.h"
 #include "log.h"
 #include "lxclock.h"
 #include "mainloop.h"
 #include "start.h" 	/* for struct lxc_handler */
+#include "terminal.h"
 #include "utils.h"
 
 #if HAVE_PTY_H
diff --git a/src/lxc/console.h b/src/lxc/terminal.h
similarity index 100%
rename from src/lxc/console.h
rename to src/lxc/terminal.h