mirror of
https://github.com/systemd/systemd
synced 2024-09-06 16:56:43 +00:00
man: avoid using the term "loaded" for units currently in memory, since we also have a unit state of that name
Fixes: #3971
This commit is contained in:
parent
57c9e04781
commit
2cdbbc9a34
|
@ -655,10 +655,10 @@
|
|||
<term><command>list-units <optional><replaceable>PATTERN</replaceable>...</optional></command></term>
|
||||
|
||||
<listitem>
|
||||
<para>List units that <command>systemd</command> has loaded. This includes units that are either referenced
|
||||
directly or through a dependency, units that are pinned by applications programmatically, or units that
|
||||
were active in the past and have failed. By default only units which are active, have pending jobs, or have
|
||||
failed are shown; this can be changed with option <option>--all</option>. If one or more
|
||||
<para>List units that <command>systemd</command> currently has in memory. This includes units that are
|
||||
either referenced directly or through a dependency, units that are pinned by applications programmatically,
|
||||
or units that were active in the past and have failed. By default only units which are active, have pending
|
||||
jobs, or have failed are shown; this can be changed with option <option>--all</option>. If one or more
|
||||
<replaceable>PATTERN</replaceable>s are specified, only units matching one of them are shown. The units
|
||||
that are shown are additionally filtered by <option>--type=</option> and <option>--state=</option> if those
|
||||
options are specified.</para>
|
||||
|
@ -671,9 +671,8 @@
|
|||
<term><command>list-sockets <optional><replaceable>PATTERN</replaceable>...</optional></command></term>
|
||||
|
||||
<listitem>
|
||||
<para>List socket units ordered by listening address.
|
||||
If one or more <replaceable>PATTERN</replaceable>s are
|
||||
specified, only socket units matching one of them are
|
||||
<para>List socket units currently in memory, ordered by listening address. If one or more
|
||||
<replaceable>PATTERN</replaceable>s are specified, only socket units matching one of them are
|
||||
shown. Produces output similar to
|
||||
<programlisting>
|
||||
LISTEN UNIT ACTIVATES
|
||||
|
@ -687,8 +686,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
|
|||
is not suitable for programmatic consumption.
|
||||
</para>
|
||||
|
||||
<para>See also the options <option>--show-types</option>,
|
||||
<option>--all</option>, and <option>--state=</option>.</para>
|
||||
<para>Also see <option>--show-types</option>, <option>--all</option>, and <option>--state=</option>.</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
|
@ -696,13 +694,11 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
|
|||
<term><command>list-timers <optional><replaceable>PATTERN</replaceable>...</optional></command></term>
|
||||
|
||||
<listitem>
|
||||
<para>List timer units ordered by the time they elapse
|
||||
next. If one or more <replaceable>PATTERN</replaceable>s
|
||||
are specified, only units matching one of them are shown.
|
||||
<para>List timer units currently in memory, ordered by the time they elapse next. If one or more
|
||||
<replaceable>PATTERN</replaceable>s are specified, only units matching one of them are shown.
|
||||
</para>
|
||||
|
||||
<para>See also the options <option>--all</option> and
|
||||
<option>--state=</option>.</para>
|
||||
<para>Also see <option>--all</option> and <option>--state=</option>.</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
|
@ -713,8 +709,8 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
|
|||
<para>Start (activate) one or more units specified on the
|
||||
command line.</para>
|
||||
|
||||
<para>Note that glob patterns operate on the set of primary names of currently loaded units. Units which
|
||||
are not active and are not in a failed state usually are not loaded, and will not be matched by any
|
||||
<para>Note that glob patterns operate on the set of primary names of units currently in memory. Units which
|
||||
are not active and are not in a failed state usually are not in memory, and will not be matched by any
|
||||
pattern. In addition, in case of instantiated units, systemd is often unaware of the instance name until
|
||||
the instance has been started. Therefore, using glob patterns with <command>start</command> has limited
|
||||
usefulness. Also, secondary alias names of units are not considered.</para>
|
||||
|
@ -1759,7 +1755,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
|
|||
are equivalent to:
|
||||
<programlisting># systemctl status dev-sda.device
|
||||
# systemctl status home.mount</programlisting>
|
||||
In the second case, shell-style globs will be matched against the primary names of all currently loaded units;
|
||||
In the second case, shell-style globs will be matched against the primary names of all units currently in memory;
|
||||
literal unit names, with or without a suffix, will be treated as in the first case. This means that literal unit
|
||||
names always refer to exactly one unit, but globs may match zero units and this is not considered an
|
||||
error.</para>
|
||||
|
@ -1771,11 +1767,11 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
|
|||
<literal>[]</literal> may be used. See
|
||||
<citerefentry project='man-pages'><refentrytitle>glob</refentrytitle><manvolnum>7</manvolnum></citerefentry>
|
||||
for more details. The patterns are matched against the primary names of
|
||||
currently loaded units, and patterns which do not match anything
|
||||
units currently in memory, and patterns which do not match anything
|
||||
are silently skipped. For example:
|
||||
<programlisting># systemctl stop sshd@*.service</programlisting>
|
||||
will stop all <filename>sshd@.service</filename> instances. Note that alias names of units, and units that aren't
|
||||
loaded are not considered for glob expansion.
|
||||
in memory are not considered for glob expansion.
|
||||
</para>
|
||||
|
||||
<para>For unit file commands, the specified <replaceable>NAME</replaceable> should be the name of the unit file
|
||||
|
|
|
@ -6721,9 +6721,9 @@ static void systemctl_help(void) {
|
|||
" -t --type=TYPE List units of a particular type\n"
|
||||
" --state=STATE List units with particular LOAD or SUB or ACTIVE state\n"
|
||||
" -p --property=NAME Show only properties by this name\n"
|
||||
" -a --all Show all loaded units/properties, including dead/empty\n"
|
||||
" ones. To list all units installed on the system, use\n"
|
||||
" the 'list-unit-files' command instead.\n"
|
||||
" -a --all Show all properties/all units currently in memory,\n"
|
||||
" including dead/empty ones. To list all units installed on\n"
|
||||
" the system, use the 'list-unit-files' command instead.\n"
|
||||
" -l --full Don't ellipsize unit names on output\n"
|
||||
" -r --recursive Show unit list of host and local containers\n"
|
||||
" --reverse Show reverse dependencies with 'list-dependencies'\n"
|
||||
|
@ -6758,9 +6758,11 @@ static void systemctl_help(void) {
|
|||
" --firmware-setup Tell the firmware to show the setup menu on next boot\n"
|
||||
" --plain Print unit dependencies as a list instead of a tree\n\n"
|
||||
"Unit Commands:\n"
|
||||
" list-units [PATTERN...] List loaded units\n"
|
||||
" list-sockets [PATTERN...] List loaded sockets ordered by address\n"
|
||||
" list-timers [PATTERN...] List loaded timers ordered by next elapse\n"
|
||||
" list-units [PATTERN...] List units currently in memory\n"
|
||||
" list-sockets [PATTERN...] List socket units currently in memory, ordered\n"
|
||||
" by address\n"
|
||||
" list-timers [PATTERN...] List timer units currently in memory, ordered\n"
|
||||
" by next elapse\n"
|
||||
" start NAME... Start (activate) one or more units\n"
|
||||
" stop NAME... Stop (deactivate) one or more units\n"
|
||||
" reload NAME... Reload one or more units\n"
|
||||
|
|
Loading…
Reference in a new issue