diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index a426842bbb3aa..65c001215d2f6 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 06b1bcf9b4694..3f1503ad4842f 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) diff --git a/src/systemd/sd-messages.h b/src/systemd/sd-messages.h index 674dd6dfd16a7..ffb9ba473956a 100644 --- a/src/systemd/sd-messages.h +++ b/src/systemd/sd-messages.h @@ -183,11 +183,11 @@ _SD_BEGIN_DECLARATIONS; #define SD_MESSAGE_TIME_SYNC SD_ID128_MAKE(7c,8a,41,f3,7b,76,49,41,a0,e1,78,0b,1b,e2,f0,37) #define SD_MESSAGE_TIME_SYNC_STR SD_ID128_MAKE_STR(7c,8a,41,f3,7b,76,49,41,a0,e1,78,0b,1b,e2,f0,37) -#define SD_MESSAGE_LOGIND_SHUTDOWN SD_ID128_MAKE(9e,70,66,27,9d,c8,40,3d,a7,9c,e4,b1,a6,90,64,b2) -#define SD_MESSAGE_LOGIND_SHUTDOWN_STR SD_ID128_MAKE_STR(9e,70,66,27,9d,c8,40,3d,a7,9c,e4,b1,a6,90,64,b2) +#define SD_MESSAGE_SHUTDOWN_SCHEDULED SD_ID128_MAKE(9e,70,66,27,9d,c8,40,3d,a7,9c,e4,b1,a6,90,64,b2) +#define SD_MESSAGE_SHUTDOWN_SCHEDULED_STR SD_ID128_MAKE_STR(9e,70,66,27,9d,c8,40,3d,a7,9c,e4,b1,a6,90,64,b2) -#define SD_MESSAGE_LOGIND_SHUTDOWN_CANCELED SD_ID128_MAKE(24,9f,6f,b9,e6,e2,42,8c,96,f3,f0,87,56,81,ff,a3) -#define SD_MESSAGE_LOGIND_SHUTDOWN_CANCELED_STR SD_ID128_MAKE_STR(24,9f,6f,b9,e6,e2,42,8c,96,f3,f0,87,56,81,ff,a3) +#define SD_MESSAGE_SHUTDOWN_CANCELED SD_ID128_MAKE(24,9f,6f,b9,e6,e2,42,8c,96,f3,f0,87,56,81,ff,a3) +#define SD_MESSAGE_SHUTDOWN_CANCELED_STR SD_ID128_MAKE_STR(24,9f,6f,b9,e6,e2,42,8c,96,f3,f0,87,56,81,ff,a3) _SD_END_DECLARATIONS;