From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 23 Nov 2023 21:42:22 +0000 (+0900)
Subject: login: do not clear wall message before shutting down
X-Git-Tag: v255-rc4~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bab4caaf9e144758c836bec0e5a13874d5d1518;p=thirdparty%2Fsystemd.git

login: do not clear wall message before shutting down

This fixes a regression caused by 5ed73478e1b1560274038ef30ec6f89022b4d8f6
and aa6123e85e0baea21b6daad175da43ffea30629f.

With these commits, when Reboot dbus method or friends is called,
reset_scheduled_shutdown() is called before shutting down the system,
so the wall message was cleared.

As the wall message itself is unrelated to the scheduling of shutting
down systems, let's keep the message.

Fixes #30167.
---

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index ec88c55a089..ae9b2cbf363 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -2330,7 +2330,6 @@ static void reset_scheduled_shutdown(Manager *m) {
         m->scheduled_shutdown_timeout = USEC_INFINITY;
         m->scheduled_shutdown_uid = UID_INVALID;
         m->scheduled_shutdown_tty = mfree(m->scheduled_shutdown_tty);
-        m->wall_message = mfree(m->wall_message);
         m->shutdown_dry_run = false;
 
         if (m->unlink_nologin) {