From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 21 Feb 2024 08:59:51 +0000 (+0100)
Subject: bsod: don't fail in an error path
X-Git-Tag: v256-rc1~772^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d10b4f573847c71649befb62455a8b26bff4a2d;p=thirdparty%2Fsystemd.git

bsod: don't fail in an error path

If we fail in an error path, don't override the error we are processing,
just print a warning and continue.
---

diff --git a/src/journal/bsod.c b/src/journal/bsod.c
index 3c64a838909..a4788b828cf 100644
--- a/src/journal/bsod.c
+++ b/src/journal/bsod.c
@@ -235,7 +235,7 @@ static int display_emergency_message_fullscreen(const char *message) {
 
 cleanup:
         if (original_vt > 0 && ioctl(fd, VT_ACTIVATE, original_vt) < 0)
-                return log_error_errno(errno, "Failed to switch back to original VT /dev/tty%i: %m", original_vt);
+                log_warning_errno(errno, "Failed to switch back to original VT /dev/tty%i: %m", original_vt);
 
         return r;
 }