59 lines
3.6 KiB
Diff
59 lines
3.6 KiB
Diff
From 887a8fa341d9b24a7c9cd3f1fce328f8e43a1b4f Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Tue, 7 Apr 2020 11:04:59 +0200
|
|
Subject: [PATCH] docs: hook up the new USER_NAMES document everywhere
|
|
|
|
(Also correct the set of names we accept in User=, which was forgotten
|
|
to be updated in ae480f0b09aec815b64579bb1828ea935d8ee236.
|
|
|
|
Reference: https://github.com/systemd/systemd/commit/887a8fa341d9b24a7c9cd3f1fce328f8e43a1b4f
|
|
Conflict: Remove unneeded file changes.
|
|
---
|
|
man/systemd.exec.xml | 15 +++++++++------
|
|
man/sysusers.d.xml | 3 +++
|
|
2 files changed, 12 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
|
|
index a52d8fa..bf9b030 100644
|
|
--- a/man/systemd.exec.xml
|
|
+++ b/man/systemd.exec.xml
|
|
@@ -186,12 +186,15 @@
|
|
is set, the default group of the user is used. This setting does not affect commands whose command line is
|
|
prefixed with <literal>+</literal>.</para>
|
|
|
|
- <para>Note that restrictions on the user/group name syntax are enforced: the specified name must consist only
|
|
- of the characters a-z, A-Z, 0-9, <literal>_</literal> and <literal>-</literal>, except for the first character
|
|
- which must be one of a-z, A-Z or <literal>_</literal> (i.e. numbers and <literal>-</literal> are not permitted
|
|
- as first character). The user/group name must have at least one character, and at most 31. These restrictions
|
|
- are enforced in order to avoid ambiguities and to ensure user/group names and unit files remain portable among
|
|
- Linux systems.</para>
|
|
+ <para>Note that this enforces only weak restrictions on the user/group name syntax, but will generate
|
|
+ warnings in many cases where user/group names do not adhere to the following rules: the specified
|
|
+ name should consist only of the characters a-z, A-Z, 0-9, <literal>_</literal> and
|
|
+ <literal>-</literal>, except for the first character which must be one of a-z, A-Z and
|
|
+ <literal>_</literal> (i.e. digits and <literal>-</literal> are not permitted as first character). The
|
|
+ user/group name must have at least one character, and at most 31. These restrictions are made in
|
|
+ order to avoid ambiguities and to ensure user/group names and unit files remain portable among Linux
|
|
+ systems. For further details on the names accepted and the names warned about see <ulink
|
|
+ url="https://systemd.io/USER_NAMES">User/Group Name Syntax</ulink>.</para>
|
|
|
|
<para>When used in conjunction with <varname>DynamicUser=</varname> the user/group name specified is
|
|
dynamically allocated at the time the service is started, and released at the time the service is stopped —
|
|
diff --git a/man/sysusers.d.xml b/man/sysusers.d.xml
|
|
index e47d36c..840da44 100644
|
|
--- a/man/sysusers.d.xml
|
|
+++ b/man/sysusers.d.xml
|
|
@@ -143,6 +143,9 @@ u root 0 "Superuser" /root /bin/zsh</pro
|
|
A-Z or <literal>_</literal> (i.e. numbers and <literal>-</literal> are not permitted as first character). The
|
|
user/group name must have at least one character, and at most 31.</para>
|
|
|
|
+ <para>For further details about the syntax of user/group names, see <ulink
|
|
+ url="https://systemd.io/USER_NAMES">User/Group Name Syntax</ulink>.</para>
|
|
+
|
|
<para>It is strongly recommended to pick user and group names that are unlikely to clash with normal users
|
|
created by the administrator. A good scheme to guarantee this is by prefixing all system and group names with the
|
|
underscore, and avoiding too generic names.</para>
|
|
--
|
|
2.23.0
|
|
|