From: Daniel Mack <daniel@zonque.org>
Date: Tue, 26 May 2015 16:56:40 +0000 (+0200)
Subject: logind: unlink /run/nologin when shutdown is cancelled
X-Git-Tag: v221~277
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb91034cf5907bbbabba1e8821b01f3b37aa56d5;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 1f5cf865b14..3555bcc2f5c 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;