From 87305b0fbfc0e40a948cf0a683bcf9d47b8a41a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 17 Aug 2022 13:09:49 +0200 Subject: sd-messages: rename newly added constants This hasn't been through a release yet, so we are free to change the name. Closes #24270. C.f. https://github.com/systemd/systemd/commit/907506695549c689710cd267583f6fd439711dcf#r80812414 --- src/login/logind-dbus.c | 2 +- src/login/logind-utmp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/login') diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index a426842bbb..65c001215d 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -2361,7 +2361,7 @@ static int method_cancel_scheduled_shutdown(sd_bus_message *message, void *userd log_struct(LOG_INFO, LOG_MESSAGE("System shutdown has been cancelled"), "ACTION=%s", handle_action_to_string(a->handle), - "MESSAGE_ID=" SD_MESSAGE_LOGIND_SHUTDOWN_CANCELED_STR, + "MESSAGE_ID=" SD_MESSAGE_SHUTDOWN_CANCELED_STR, username ? "OPERATOR=%s" : NULL, username); utmp_wall("System shutdown has been cancelled", diff --git a/src/login/logind-utmp.c b/src/login/logind-utmp.c index 06b1bcf9b4..3f1503ad48 100644 --- a/src/login/logind-utmp.c +++ b/src/login/logind-utmp.c @@ -90,7 +90,7 @@ static int warn_wall(Manager *m, usec_t n) { log_struct(level, LOG_MESSAGE("%s", l), "ACTION=%s", handle_action_to_string(m->scheduled_shutdown_action->handle), - "MESSAGE_ID=" SD_MESSAGE_LOGIND_SHUTDOWN_STR, + "MESSAGE_ID=" SD_MESSAGE_SHUTDOWN_SCHEDULED_STR, username ? "OPERATOR=%s" : NULL, username); if (m->enable_wall_messages) -- cgit v1.2.1