diff options
| author | Luca Boccassi <bluca@debian.org> | 2022-08-24 21:35:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-24 21:35:28 +0100 |
| commit | 298b3de6d424b1ebb771e4e5a136927dfbba107f (patch) | |
| tree | 3ab526997a6eed73fe2d08c65242074e719a51f4 /man | |
| parent | 771fe73c75781f52200ffdd30efef9fd870b7476 (diff) | |
| parent | 8795d9bacdea7074b023c9f8836720002e39adc8 (diff) | |
| download | systemd-298b3de6d424b1ebb771e4e5a136927dfbba107f.tar.gz | |
Merge pull request #24370 from keszybz/sysusers-equivs
Use /bin/bash for root shell and suppress some warnings from sysusers
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd-sysusers.xml | 27 | ||||
| -rw-r--r-- | man/systemd.unit.xml | 2 |
2 files changed, 14 insertions, 15 deletions
diff --git a/man/systemd-sysusers.xml b/man/systemd-sysusers.xml index 9011cdb755..b399b3b04c 100644 --- a/man/systemd-sysusers.xml +++ b/man/systemd-sysusers.xml @@ -35,23 +35,22 @@ <refsect1> <title>Description</title> - <para><command>systemd-sysusers</command> creates system users and - groups, based on the file format and location specified in + <para><command>systemd-sysusers</command> creates system users and groups, based on files in the format + described in <citerefentry><refentrytitle>sysusers.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>. </para> - <para>If invoked with no arguments, it applies all directives from all files - found in the directories specified by - <citerefentry><refentrytitle>sysusers.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>. - When invoked with positional arguments, if option - <option>--replace=<replaceable>PATH</replaceable></option> is specified, arguments - specified on the command line are used instead of the configuration file - <replaceable>PATH</replaceable>. Otherwise, just the configuration specified by - the command line arguments is executed. The string <literal>-</literal> may be - specified instead of a filename to instruct <command>systemd-sysusers</command> - to read the configuration from standard input. If only the basename of a file is - specified, all configuration directories are searched for a matching file and - the file found that has the highest priority is executed.</para> + <para>If invoked with no arguments, it applies all directives from all files found in the directories + specified by + <citerefentry><refentrytitle>sysusers.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>. When + invoked with positional arguments, if option <option>--replace=<replaceable>PATH</replaceable></option> + is specified, arguments specified on the command line are used instead of the configuration file + <replaceable>PATH</replaceable>. Otherwise, just the configuration specified by the command line + arguments is executed. The string <literal>-</literal> may be specified instead of a filename to instruct + <command>systemd-sysusers</command> to read the configuration from standard input. If the argument is a + relative path, all configuration directories are searched for a matching file and the file found that has + the highest priority is executed. If the argument is an absolute path, that file is used directly without + searching of the configuration directories.</para> </refsect1> <refsect1> diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 767c7186cd..95f1b98cbd 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -2108,7 +2108,7 @@ Note that this setting is <emphasis>not</emphasis> influenced by the <varname>Us <row> <entry><literal>%s</literal></entry> <entry>User shell</entry> - <entry>This is the shell of the user running the service manager instance. In case of the system manager this resolves to <literal>/bin/sh</literal>.</entry> + <entry>This is the shell of the user running the service manager instance.</entry> </row> <row> <entry><literal>%S</literal></entry> |