]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
console: report detach message on demand 1917/head
authorChristian Brauner <christian.brauner@ubuntu.com>
Fri, 10 Nov 2017 18:51:57 +0000 (19:51 +0100)
committerChristian Brauner <christian.brauner@ubuntu.com>
Fri, 10 Nov 2017 18:51:57 +0000 (19:51 +0100)
When users pass -1 there's there won't be an escape sequence to exit the
console so no need to print a misleading info message about how to detach.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
src/lxc/console.c

index 934e1d1328a0d8480ad432d991a838c021d60c57..2161657203ca0e518576d2a78d02b679e4d47507 100644 (file)
@@ -832,11 +832,14 @@ int lxc_console(struct lxc_container *c, int ttynum,
                goto close_mainloop;
        }
 
-       fprintf(stderr, "\n"
+       if (ts->escape >= 1) {
+               fprintf(stderr,
+                       "\n"
                        "Connected to tty %1$d\n"
                        "Type <Ctrl+%2$c q> to exit the console, "
                        "<Ctrl+%2$c Ctrl+%2$c> to enter Ctrl+%2$c itself\n",
                        ttynum, 'a' + escape - 1);
+       }
 
        if (istty) {
                ret = lxc_setup_tios(stdinfd, &oldtios);