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

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 \

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

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"
 
 /*

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>

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;

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"
 

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);
 

src/lxc/console.c → 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