43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
|
From 21804157ff0e60508fd128310505381f7b3ec2b0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lennart Poettering <lennart@poettering.net>
|
||
|
|
Date: Wed, 18 Dec 2013 16:49:15 +0100
|
||
|
|
Subject: [PATCH] log: when we log to /dev/console and got disconnected (maybe
|
||
|
|
due to vhangup) reconnect
|
||
|
|
|
||
|
|
---
|
||
|
|
src/shared/log.c | 21 +++++++++++++++++++--
|
||
|
|
1 file changed, 19 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/shared/log.c b/src/shared/log.c
|
||
|
|
index bd918fb..de770ca 100644
|
||
|
|
--- a/src/shared/log.c
|
||
|
|
+++ b/src/shared/log.c
|
||
|
|
@@ -335,8 +335,25 @@ static int write_to_console(
|
||
|
|
IOVEC_SET_STRING(iovec[n++], ANSI_HIGHLIGHT_OFF);
|
||
|
|
IOVEC_SET_STRING(iovec[n++], "\n");
|
||
|
|
|
||
|
|
- if (writev(console_fd, iovec, n) < 0)
|
||
|
|
- return -errno;
|
||
|
|
+ if (writev(console_fd, iovec, n) < 0) {
|
||
|
|
+
|
||
|
|
+ if (errno == EIO && getpid() == 1) {
|
||
|
|
+
|
||
|
|
+ /* If somebody tried to kick us from our
|
||
|
|
+ * console tty (via vhangup() or suchlike),
|
||
|
|
+ * try to reconnect */
|
||
|
|
+
|
||
|
|
+ log_close_console();
|
||
|
|
+ log_open_console();
|
||
|
|
+
|
||
|
|
+ if (console_fd < 0)
|
||
|
|
+ return 0;
|
||
|
|
+
|
||
|
|
+ if (writev(console_fd, iovec, n) < 0)
|
||
|
|
+ return -errno;
|
||
|
|
+ } else
|
||
|
|
+ return -errno;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
return 1;
|
||
|
|
}
|