diff options
author | Lennart Poettering <lennart@poettering.net> | 2022-07-13 11:06:04 +0200 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-07-16 00:47:22 +0900 |
commit | 3acb6edef3857aa54ca9008fc3428a5f5e1a8bb7 (patch) | |
tree | 8b693f3a6bb45acff507491b697b4b1532b5dce8 /man | |
parent | 69a7d108327fa5d4b4e8e913441e924b2187cd78 (diff) | |
download | systemd-3acb6edef3857aa54ca9008fc3428a5f5e1a8bb7.tar.gz |
sysusers: allow defining additional sysusers lines via credentials
Diffstat (limited to 'man')
-rw-r--r-- | man/systemd-sysctl.service.xml | 8 | ||||
-rw-r--r-- | man/systemd-sysusers.xml | 19 |
2 files changed, 18 insertions, 9 deletions
diff --git a/man/systemd-sysctl.service.xml b/man/systemd-sysctl.service.xml index 2313d4c44d..312bc3ba43 100644 --- a/man/systemd-sysctl.service.xml +++ b/man/systemd-sysctl.service.xml @@ -86,10 +86,10 @@ <term><literal>sysctl.extra</literal></term> <listitem><para>The contents of this credential may contain additional lines to operate on. The - credential contents should follow the same format as any other <filename>sysctl.d/</filename> - drop-in. If this credential is passed it is processed after all of the drop-in files read from the - file system. The settings configured in the credential hence take precedence over those in the file - system.</para></listitem> + credential contents should follow the same format as any other <filename>sysctl.d/</filename> drop-in + configuration file. If this credential is passed it is processed after all of the drop-in files read + from the file system. The settings configured in the credential hence take precedence over those in + the file system.</para></listitem> </varlistentry> </variablelist> diff --git a/man/systemd-sysusers.xml b/man/systemd-sysusers.xml index 7da7b18dcf..9011cdb755 100644 --- a/man/systemd-sysusers.xml +++ b/man/systemd-sysusers.xml @@ -169,18 +169,27 @@ <listitem><para>Specifies the shell binary to use for the specified account when creating it.</para></listitem> </varlistentry> + + <varlistentry> + <term><literal>sysusers.extra</literal></term> + + <listitem><para>The contents of this credential may contain additional lines to operate on. The + credential contents should follow the same format as any other <filename>sysusers.d/</filename> + drop-in. If this credential is passed it is processed after all of the drop-in files read from the + file system.</para></listitem> + </varlistentry> </variablelist> <para>Note that by default the <filename>systemd-sysusers.service</filename> unit file is set up to inherit the <literal>passwd.hashed-password.root</literal>, - <literal>passwd.plaintext-password.root</literal> and <literal>passwd.shell.root</literal> credentials - from the service manager. Thus, when invoking a container with an unpopulated <filename>/etc/</filename> - for the first time it is possible to configure the root user's password to be <literal>systemd</literal> - like this:</para> + <literal>passwd.plaintext-password.root</literal>, <literal>passwd.shell.root</literal> and + <literal>sysusers.extra</literal> credentials from the service manager. Thus, when invoking a container + with an unpopulated <filename>/etc/</filename> for the first time it is possible to configure the root + user's password to be <literal>systemd</literal> like this:</para> <para><programlisting># systemd-nspawn --image=… --set-credential=passwd.hashed-password.root:'$y$j9T$yAuRJu1o5HioZAGDYPU5d.$F64ni6J2y2nNQve90M/p0ZP0ECP/qqzipNyaY9fjGpC' …</programlisting></para> - <para>Note again that the data specified in these credentials is consulted only when creating an account + <para>Note again that the data specified in this credential is consulted only when creating an account for the first time, it may not be used for changing the password or shell of an account that already exists.</para> |