diff options
| author | Daniel Mack <daniel@zonque.org> | 2015-05-26 18:56:40 +0200 |
|---|---|---|
| committer | Daniel Mack <daniel@zonque.org> | 2015-05-27 13:45:31 +0200 |
| commit | fb91034cf5907bbbabba1e8821b01f3b37aa56d5 (patch) | |
| tree | 95094aa7625b64a0f0ff18825719b046bf12a5bd /src | |
| parent | 45afd51974fb6a88c5b1fe0b325b7b20fd7b7449 (diff) | |
logind: unlink /run/nologin when shutdown is cancelled
When a scheduled is cancelled, make sure to remove /run/nologin.
This is a regression from the recent shutdownd removal and logind rework.
Diffstat (limited to 'src')
| -rw-r--r-- | src/login/logind-dbus.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 1f5cf865b1..3555bcc2f5 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -1964,6 +1964,11 @@ static int method_cancel_scheduled_shutdown(sd_bus_message *message, void *userd m->scheduled_shutdown_type = NULL; m->scheduled_shutdown_timeout = 0; + if (m->unlink_nologin) { + unlink("/run/nologin"); + m->unlink_nologin = false; + } + if (cancelled) { _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; const char *tty = NULL; |