daandemeyer / rpms / systemd

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