diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-05-08 17:51:42 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-05-11 16:47:40 +0200 |
| commit | 153d1579ef5255e589cefab0cf149c55580a25a4 (patch) | |
| tree | 7e0046dd32adde0ac6a9cb90dc476a25f16802af /src/login | |
| parent | 0cb09bcb825ab86ba4ca70be4e6322eaf9baee95 (diff) | |
| download | systemd-153d1579ef5255e589cefab0cf149c55580a25a4.tar.gz | |
logind: rename "log_message" to "log_verb"
This field is used to log SHUTDOWN=. Calling it "something-message" is
confusing.
Diffstat (limited to 'src/login')
| -rw-r--r-- | src/login/logind-action.c | 8 | ||||
| -rw-r--r-- | src/login/logind-action.h | 2 | ||||
| -rw-r--r-- | src/login/logind-dbus.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/login/logind-action.c b/src/login/logind-action.c index 5a691307b3..6a873009bc 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 03284414c5..c891787e6c 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 5c17d4ec04..f7cff58005 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) { |