diff options
| author | Daniel Mack <github@zonque.org> | 2015-09-30 18:40:57 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-09-30 18:40:57 +0200 |
| commit | 234ae0090309b5bb049f6813798bd2b4615414bc (patch) | |
| tree | b4f7c34e42fa89eb81bf044b13f6c36b30e68874 /src | |
| parent | 75ec4439ea0c9354d35dc423b3a7c272c856b076 (diff) | |
| parent | f868cb58c1274d51a4615a69dc2bf6ee7764cb04 (diff) | |
Merge pull request #1421 from keszybz/formatting-fixes
logind: avoid a dot before parenthesis
Diffstat (limited to 'src')
| -rw-r--r-- | src/login/logind-dbus.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 22e37a1638..40d587ddb8 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -1352,24 +1352,26 @@ static int bus_manager_log_shutdown( return 0; if (streq(unit_name, SPECIAL_POWEROFF_TARGET)) { - p = "MESSAGE=System is powering down."; + p = "MESSAGE=System is powering down"; q = "SHUTDOWN=power-off"; } else if (streq(unit_name, SPECIAL_HALT_TARGET)) { - p = "MESSAGE=System is halting."; + p = "MESSAGE=System is halting"; q = "SHUTDOWN=halt"; } else if (streq(unit_name, SPECIAL_REBOOT_TARGET)) { - p = "MESSAGE=System is rebooting."; + p = "MESSAGE=System is rebooting"; q = "SHUTDOWN=reboot"; } else if (streq(unit_name, SPECIAL_KEXEC_TARGET)) { - p = "MESSAGE=System is rebooting with kexec."; + p = "MESSAGE=System is rebooting with kexec"; q = "SHUTDOWN=kexec"; } else { - p = "MESSAGE=System is shutting down."; + p = "MESSAGE=System is shutting down"; q = NULL; } - if (!isempty(m->wall_message)) - p = strjoina(p, " (", m->wall_message, ")"); + if (isempty(m->wall_message)) + p = strjoina(p, "."); + else + p = strjoina(p, " (", m->wall_message, ")."); return log_struct(LOG_NOTICE, LOG_MESSAGE_ID(SD_MESSAGE_SHUTDOWN), |