From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 8 May 2022 15:51:42 +0000 (+0200)
Subject: logind: rename "log_message" to "log_verb"
X-Git-Tag: v251-rc3~14^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=153d1579ef5255e589cefab0cf149c55580a25a4;p=thirdparty%2Fsystemd.git

logind: rename "log_message" to "log_verb"

This field is used to log SHUTDOWN=. Calling it "something-message" is
confusing.
---

diff --git a/src/login/logind-action.c b/src/login/logind-action.c
index 5a691307b3a..6a873009bc0 100644
--- a/src/login/logind-action.c
+++ b/src/login/logind-action.c
@@ -29,7 +29,7 @@ static const HandleActionData handle_action_data_table[_HANDLE_ACTION_MAX] = {
                 .sleep_operation                 = _SLEEP_OPERATION_INVALID,
                 .message_id                      = SD_MESSAGE_SHUTDOWN_STR,
                 .message                         = "System is powering down",
-                .log_message                     = "power-off",
+                .log_verb                        = "power-off",
         },
         [HANDLE_REBOOT] = {
                 .handle                          = HANDLE_REBOOT,
@@ -41,7 +41,7 @@ static const HandleActionData handle_action_data_table[_HANDLE_ACTION_MAX] = {
                 .sleep_operation                 = _SLEEP_OPERATION_INVALID,
                 .message_id                      = SD_MESSAGE_SHUTDOWN_STR,
                 .message                         = "System is rebooting",
-                .log_message                     = "reboot",
+                .log_verb                        = "reboot",
         },
         [HANDLE_HALT] = {
                 .handle                          = HANDLE_HALT,
@@ -53,7 +53,7 @@ static const HandleActionData handle_action_data_table[_HANDLE_ACTION_MAX] = {
                 .sleep_operation                 = _SLEEP_OPERATION_INVALID,
                 .message_id                      = SD_MESSAGE_SHUTDOWN_STR,
                 .message                         = "System is halting",
-                .log_message                     = "halt",
+                .log_verb                        = "halt",
         },
         [HANDLE_KEXEC] = {
                 .handle                          = HANDLE_KEXEC,
@@ -65,7 +65,7 @@ static const HandleActionData handle_action_data_table[_HANDLE_ACTION_MAX] = {
                 .sleep_operation                 = _SLEEP_OPERATION_INVALID,
                 .message_id                      = SD_MESSAGE_SHUTDOWN_STR,
                 .message                         = "System is rebooting with kexec",
-                .log_message                     = "kexec",
+                .log_verb                        = "kexec",
         },
         [HANDLE_SUSPEND] = {
                 .handle                          = HANDLE_SUSPEND,
diff --git a/src/login/logind-action.h b/src/login/logind-action.h
index 03284414c57..c891787e6cd 100644
--- a/src/login/logind-action.h
+++ b/src/login/logind-action.h
@@ -39,7 +39,7 @@ struct HandleActionData {
         SleepOperation sleep_operation;
         const char* message_id;
         const char* message;
-        const char* log_message;
+        const char* log_verb;
 };
 
 int manager_handle_action(
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 5c17d4ec042..f7cff580051 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1519,7 +1519,7 @@ static int bus_manager_log_shutdown(
         assert(a);
 
         const char *message = a->message ?: "System is shutting down";
-        const char *log_message = a->log_message ? strjoina("SHUTDOWN=", a->log_message) : NULL;
+        const char *log_verb = a->log_verb ? strjoina("SHUTDOWN=", a->log_verb) : NULL;
 
         return log_struct(LOG_NOTICE,
                           "MESSAGE_ID=%s", a->message_id ?: SD_MESSAGE_SHUTDOWN_STR,
@@ -1528,7 +1528,7 @@ static int bus_manager_log_shutdown(
                                       m->wall_message ? " (" : "",
                                       strempty(m->wall_message),
                                       m->wall_message ? ")" : ""),
-                          log_message);
+                          log_verb);
 }
 
 static int lid_switch_ignore_handler(sd_event_source *e, uint64_t usec, void *userdata) {