You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
78 lines
3.1 KiB
78 lines
3.1 KiB
8 months ago
|
From 9e9c6cbbdd60f4538cee041ffe3f9cd831c5de17 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lennart Poettering <lennart@poettering.net>
|
||
|
|
Date: Fri, 3 Aug 2018 20:21:27 +0200
|
||
|
|
Subject: [PATCH] logind: improve logging in manager_connect_console()
|
||
|
|
|
||
|
|
let's make sure we log about every failure
|
||
|
|
|
||
|
|
Also, complain about systems where /dev/tty0 exists but
|
||
|
|
/sys/class/tty/tty0/active does not. Such systems (usually container
|
||
|
|
environments) are pretty broken as they mount something that is not a VC
|
||
|
|
to /dev/tty0 and they really shouldn't.
|
||
|
|
|
||
|
|
Systems should either have a VC or not, but not badly fake one by
|
||
|
|
mounting things wildly.
|
||
|
|
|
||
|
|
This just adds a warning message, as before we'll simply turn off VC
|
||
|
|
handling in this case.
|
||
|
|
|
||
|
|
(cherry picked from commit 0b6d55cae9b8adc507fbea95d1b2874729a77386)
|
||
|
|
|
||
|
|
Related: #1642460
|
||
|
|
---
|
||
|
|
src/login/logind.c | 22 +++++++++++-----------
|
||
|
|
1 file changed, 11 insertions(+), 11 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/login/logind.c b/src/login/logind.c
|
||
|
|
index 52fcee933c..1b366cd55f 100644
|
||
|
|
--- a/src/login/logind.c
|
||
|
|
+++ b/src/login/logind.c
|
||
|
|
@@ -815,28 +815,28 @@ static int manager_connect_console(Manager *m) {
|
||
|
|
assert(m);
|
||
|
|
assert(m->console_active_fd < 0);
|
||
|
|
|
||
|
|
- /* On certain architectures (S390 and Xen, and containers),
|
||
|
|
- /dev/tty0 does not exist, so don't fail if we can't open
|
||
|
|
- it. */
|
||
|
|
+ /* On certain systems (such as S390, Xen, and containers) /dev/tty0 does not exist (as there is no VC), so
|
||
|
|
+ * don't fail if we can't open it. */
|
||
|
|
+
|
||
|
|
if (access("/dev/tty0", F_OK) < 0)
|
||
|
|
return 0;
|
||
|
|
|
||
|
|
m->console_active_fd = open("/sys/class/tty/tty0/active", O_RDONLY|O_NOCTTY|O_CLOEXEC);
|
||
|
|
if (m->console_active_fd < 0) {
|
||
|
|
|
||
|
|
- /* On some systems the device node /dev/tty0 may exist
|
||
|
|
- * even though /sys/class/tty/tty0 does not. */
|
||
|
|
- if (errno == ENOENT)
|
||
|
|
+ /* On some systems /dev/tty0 may exist even though /sys/class/tty/tty0 does not. These are broken, but
|
||
|
|
+ * common. Let's complain but continue anyway. */
|
||
|
|
+ if (errno == ENOENT) {
|
||
|
|
+ log_warning_errno(errno, "System has /dev/tty0 but not /sys/class/tty/tty0/active which is broken, ignoring: %m");
|
||
|
|
return 0;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
return log_error_errno(errno, "Failed to open /sys/class/tty/tty0/active: %m");
|
||
|
|
}
|
||
|
|
|
||
|
|
r = sd_event_add_io(m->event, &m->console_active_event_source, m->console_active_fd, 0, manager_dispatch_console, m);
|
||
|
|
- if (r < 0) {
|
||
|
|
- log_error("Failed to watch foreground console");
|
||
|
|
- return r;
|
||
|
|
- }
|
||
|
|
+ if (r < 0)
|
||
|
|
+ return log_error_errno(r, "Failed to watch foreground console: %m");
|
||
|
|
|
||
|
|
/*
|
||
|
|
* SIGRTMIN is used as global VT-release signal, SIGRTMIN + 1 is used
|
||
|
|
@@ -855,7 +855,7 @@ static int manager_connect_console(Manager *m) {
|
||
|
|
|
||
|
|
r = sd_event_add_signal(m->event, NULL, SIGRTMIN, manager_vt_switch, m);
|
||
|
|
if (r < 0)
|
||
|
|
- return r;
|
||
|
|
+ return log_error_errno(r, "Failed to subscribe to signal: %m");
|
||
|
|
|
||
|
|
return 0;
|
||
|
|
}
|