diff options
author | Lennart Poettering <lennart@poettering.net> | 2018-02-22 14:21:30 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-02-22 14:21:30 +0100 |
commit | 6e11e7e67db3d9ccf472cb92a6030c084417bbb7 (patch) | |
tree | 41947cbe3f2106993d91611d4b0929ec85189a79 /src/user-sessions | |
parent | c5c07649c2fa0f5830058e6f0d84b955c7951cf4 (diff) | |
download | systemd-6e11e7e67db3d9ccf472cb92a6030c084417bbb7.tar.gz |
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.
Diffstat (limited to 'src/user-sessions')
-rw-r--r-- | src/user-sessions/user-sessions.c | 9 |
1 files changed, 3 insertions, 6 deletions
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; } |