From 6e11e7e67db3d9ccf472cb92a6030c084417bbb7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 22 Feb 2018 14:21:30 +0100 Subject: nologin: extend the /run/nologin descriptions a bit (#8244) This is an attempt to improve #8228 a bit, by extending the /run/nologin a bit, but still keeping it somewhat brief. On purpose I used the vague wording "unprivileged user" rather than "non-root user" so that pam_nologin can be updated to disable its behaviour for members of the "wheel" group one day, and our messages would still make sense. See #8228. --- src/user-sessions/user-sessions.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/user-sessions') diff --git a/src/user-sessions/user-sessions.c b/src/user-sessions/user-sessions.c index 5e02ede402..8e8d43e1d4 100644 --- a/src/user-sessions/user-sessions.c +++ b/src/user-sessions/user-sessions.c @@ -51,12 +51,9 @@ int main(int argc, char*argv[]) { if (k < 0 && r >= 0) r = k; - } else if (streq(argv[1], "stop")) { - r = write_string_file_atomic_label("/run/nologin", "System is going down."); - if (r < 0) - log_error_errno(r, "Failed to create /run/nologin: %m"); - - } else { + } else if (streq(argv[1], "stop")) + r = create_shutdown_run_nologin_or_warn(); + else { log_error("Unknown verb '%s'.", argv[1]); r = -EINVAL; } -- cgit v1.2.1