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 ba41e734078518645c0ff5afe26e72f2efafe8ba..fb799c8db29e8c8852697326a05407292501df27 100644 (file)
--- 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 919fa17e6c914f1cd1979bc35ec176c6ab1b3549..243c91c653a54e27931dce574b09a15932ba419e 100644 (file)
--- 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 9e6be55dbe42d903529e4446696a82e2d4456d98..54e9f75c557e0a934c61bc7bf40523d9e748e171 100644 (file)
--- 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 1c6742ca16377b2527fa2fba5cddeef8a429ab20..9ab400e745956aa67f06b19926e68c7436c50152 100644 (file)
--- 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 6accce685e4b81ef575a303632ea1dc9e3d1e59d..351059c9432c0a7d71177038c23fc93e2aabc966 100644 (file)
--- 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 fb82707c4f1157d3ef4d54e405e3d88be9b90c70..ede0be58f008a01bd4b59f820032bbba97c79674 100644 (file)
--- 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 bc8067e8fd1c4976fa6bff168d88f13243ae2ac5..eb7331f8a895bef8b75e74577b13c9c8d072b339 100644 (file)
--- 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 672318545d6d8578c1aa9bf89365e3bcad00d369..05a524606afed5ba294c2380fa7b9d63e2d45191 100644 (file)
--- 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