diff options
| author | Ludwig Nussel <ludwig.nussel@suse.de> | 2021-12-14 15:26:43 +0100 |
|---|---|---|
| committer | Ludwig Nussel <ludwig.nussel@suse.de> | 2022-01-25 14:46:37 +0100 |
| commit | 90b1ec03b2ce939f589239133a32f4429f2ad6a6 (patch) | |
| tree | a1da34b22add755bd6ace95c95784dc817b22175 /src/login/logind-utmp.c | |
| parent | 06006691b5c56b6123044179d934b3ed81c237ca (diff) | |
| download | systemd-90b1ec03b2ce939f589239133a32f4429f2ad6a6.tar.gz | |
logind: fix wall message for immediate shutdowns
An elapse time of zero means NOW which should trigger a wall
message.
Diffstat (limited to 'src/login/logind-utmp.c')
| -rw-r--r-- | src/login/logind-utmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/login/logind-utmp.c b/src/login/logind-utmp.c index 5533836473..d2b2f8b193 100644 --- a/src/login/logind-utmp.c +++ b/src/login/logind-utmp.c @@ -135,11 +135,11 @@ int manager_setup_wall_message_timer(Manager *m) { return 0; } - if (elapse < n) + if (elapse > 0 && elapse < n) return 0; /* Warn immediately if less than 15 minutes are left */ - if (elapse - n < 15 * USEC_PER_MINUTE) { + if (elapse == 0 || elapse - n < 15 * USEC_PER_MINUTE) { r = warn_wall(m, n); if (r == 0) return 0; |