From ef9ffbd8065b9e06ef27fb989b1c783daf4dc1df Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 7 Oct 2010 20:46:02 +0200 Subject: [PATCH] shutdown: create /var/run/nologin instead of /etc/nologin which is supported since PAM 1.1.2 --- README | 1 + src/shutdownd.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README b/README index 12dc9fedd..756622660 100644 --- a/README +++ b/README @@ -34,3 +34,4 @@ REQUIREMENTS: gtk+ >= 2.20 dbus >= 1.2.24 libcap + PAM >= 1.1.2 (optional) diff --git a/src/shutdownd.c b/src/shutdownd.c index 72a28018c..bf69fb536 100644 --- a/src/shutdownd.c +++ b/src/shutdownd.c @@ -318,10 +318,10 @@ int main(int argc, char *argv[]) { if (pollfd[FD_NOLOGIN_TIMER].revents) { int e; - log_info("Creating /etc/nologin, blocking further logins..."); + log_info("Creating /var/run/nologin, blocking further logins..."); - if ((e = touch("/etc/nologin")) < 0) - log_error("Failed to create /etc/nologin: %s", strerror(-e)); + if ((e = write_one_line_file("/var/run/nologin", "System is going down.")) < 0) + log_error("Failed to create /var/run/nologin: %s", strerror(-e)); else unlink_nologin = true; @@ -346,7 +346,7 @@ finish: close_nointr_nofail(pollfd[i].fd); if (unlink_nologin) - unlink("/etc/nologin"); + unlink("/var/run/nologin"); if (exec_shutdown) { char sw[3]; -- 2.30.2