diff options
| author |   Daniel Mack <daniel@zonque.org> | 2015-05-26 18:56:40 +0200 |
|---|---|---|
| committer |   Mike Gilbert <floppym@gentoo.org> | 2015-05-27 22:47:32 -0400 |
| commit | 542fd52906599e6ea3c4b448b55ad46c95d96f3d (patch) | |
| tree | fba138c0ce9b717984e7f89f5c1517f8b4385f0c | |
| parent | udev: fix inotify handling (diff) | |
| download | systemd-542fd52906599e6ea3c4b448b55ad46c95d96f3d.tar.gz systemd-542fd52906599e6ea3c4b448b55ad46c95d96f3d.tar.bz2 systemd-542fd52906599e6ea3c4b448b55ad46c95d96f3d.zip | |
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.
| -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 1f5cf865b..3555bcc2f 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; |