From c7b7d4493aa03e9ef5fb1e670b8969a48aa494dd Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 22 Dec 2014 20:33:45 +0100 Subject: machinectl,nspawn: don't print extra final newline if pty terminal output was newline-terinated anyway --- src/machine/machinectl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/machine') diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index 4eebcb7716..f5b87a23d2 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -1110,6 +1110,7 @@ static int login_machine(int argc, char *argv[], void *userdata) { pid_t leader; sigset_t mask; int r, ret = 0; + char last_char = 0; assert(bus); @@ -1186,9 +1187,12 @@ static int login_machine(int argc, char *argv[], void *userdata) { if (r < 0) return log_error_errno(r, "Failed to run event loop: %m"); + pty_forward_last_char(forward, &last_char); + forward = pty_forward_free(forward); - fputc('\n', stdout); + if (last_char != '\n') + fputc('\n', stdout); log_info("Connection to container %s terminated.", argv[1]); -- cgit v1.2.3-54-g00ecf