diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/networkctl.xml | 1 | ||||
| -rw-r--r-- | man/systemd-cgtop.xml | 120 | ||||
| -rw-r--r-- | man/systemd-nspawn.xml | 7 | ||||
| -rw-r--r-- | man/systemd-resolved.service.xml | 20 | ||||
| -rw-r--r-- | man/systemd.network.xml | 17 |
5 files changed, 127 insertions, 38 deletions
diff --git a/man/networkctl.xml b/man/networkctl.xml index 388afbed93..46dab58d61 100644 --- a/man/networkctl.xml +++ b/man/networkctl.xml @@ -87,6 +87,7 @@ <xi:include href="standard-options.xml" xpointer="help" /> <xi:include href="standard-options.xml" xpointer="version" /> + <xi:include href="standard-options.xml" xpointer="no-legend" /> <xi:include href="standard-options.xml" xpointer="no-pager" /> </variablelist> diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml index d4b041a1f9..0e0ea3ba7a 100644 --- a/man/systemd-cgtop.xml +++ b/man/systemd-cgtop.xml @@ -1,4 +1,4 @@ -<?xml version='1.0'?> <!--*-nxml-*--> +<?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*--> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> @@ -64,10 +64,10 @@ regular intervals (by default every 1s), similar in style to <citerefentry project='man-pages'><refentrytitle>top</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para> - <para>If <command>systemd-cgtop</command> is not connected to a tty, no - column headers are printed and the default is to only run one iteration. - The <varname>--iterations</varname> argument, if given, is still honored. - This mode is suitable for scripting.</para> + <para>If <command>systemd-cgtop</command> is not connected to a + tty, no column headers are printed and the default is to only run + one iteration. The <varname>--iterations=</varname> argument, if + given, is honored. This mode is suitable for scripting.</para> <para>Resource usage is only accounted for control groups in the relevant hierarchy, i.e. CPU usage is only accounted for control @@ -104,6 +104,7 @@ <variablelist> <varlistentry> <term><option>-p</option></term> + <term><option>--order=path</option></term> <listitem><para>Order by control group path name.</para></listitem> @@ -111,25 +112,28 @@ <varlistentry> <term><option>-t</option></term> + <term><option>--order=tasks</option></term> - <listitem><para>Order by number of tasks in control group - (i.e. threads and processes).</para></listitem> + <listitem><para>Order by number of processes in control group.</para></listitem> </varlistentry> <varlistentry> <term><option>-c</option></term> + <term><option>--order=cpu</option></term> <listitem><para>Order by CPU load.</para></listitem> </varlistentry> <varlistentry> <term><option>-m</option></term> + <term><option>--order=memory</option></term> <listitem><para>Order by memory usage.</para></listitem> </varlistentry> <varlistentry> <term><option>-i</option></term> + <term><option>--order=io</option></term> <listitem><para>Order by disk I/O load.</para></listitem> </varlistentry> @@ -140,7 +144,7 @@ <listitem><para>Run in "batch" mode: do not accept input and run until the iteration limit set with - <option>--iterations</option> is exhausted or until killed. + <option>--iterations=</option> is exhausted or until killed. This mode could be useful for sending output from <command>systemd-cgtop</command> to other programs or to a file.</para></listitem> @@ -156,11 +160,44 @@ </varlistentry> <varlistentry> + <term><option>--cpu=percentage</option></term> + <term><option>--cpu=time</option></term> + + <listitem><para>Controls whether the CPU usage is shown as + percentage or time. By default the CPU usage is shown as + percentage. This setting may also be toggled at runtime by + pressing the <keycap>%</keycap> key.</para></listitem> + </varlistentry> + + <varlistentry> + <term><option>-k</option></term> + + <listitem><para>Include kernel threads when counting tasks in + control groups. By default, kernel threads are not included in + the count. This setting may also be toggled at runtime by + pressing the <keycap>k</keycap> key.</para></listitem> + </varlistentry> + + <varlistentry> + <term><option>--recursive=</option></term> + + <listitem><para>Controls whether the number of tasks shown for + a control group shall include all tasks that are contained in + any of the child control groups as well. Takes a boolean + argument, defaults to <literal>yes</literal>. If enabled the + tasks in child control groups are included, if disabled only + the tasks in the control group itself are counted. This + setting may also be toggled at runtime by pressing the + <keycap>r</keycap> key.</para></listitem> + </varlistentry> + + <varlistentry> <term><option>-n</option></term> <term><option>--iterations=</option></term> - <listitem><para>Perform only this many iterations. A value of 0 - indicates that the program should run indefinitely.</para></listitem> + <listitem><para>Perform only this many iterations. A value of + 0 indicates that the program should run + indefinitely.</para></listitem> </varlistentry> <varlistentry> @@ -168,10 +205,11 @@ <term><option>--delay=</option></term> <listitem><para>Specify refresh delay in seconds (or if one of - <literal>ms</literal>, - <literal>us</literal>, + <literal>ms</literal>, <literal>us</literal>, <literal>min</literal> is specified as unit in this time - unit).</para></listitem> + unit). This setting may also be increased and decreased at + runtime by pressing the <keycap>+</keycap> and + <keycap>-</keycap> keys.</para></listitem> </varlistentry> <varlistentry> @@ -191,7 +229,6 @@ </refsect1> - <refsect1> <title>Keys</title> @@ -200,49 +237,72 @@ <variablelist> <varlistentry> - <term>h</term> + <term><keycap>h</keycap></term> <listitem><para>Shows a short help text.</para></listitem> </varlistentry> <varlistentry> - <term>SPACE</term> + <term><keycap function="space"/></term> <listitem><para>Immediately refresh output.</para></listitem> </varlistentry> <varlistentry> - <term>q</term> + <term><keycap>q</keycap></term> <listitem><para>Terminate the program.</para></listitem> </varlistentry> - <varlistentry> - <term>p</term> - <term>t</term> - <term>c</term> - <term>m</term> - <term>i</term> + <term><keycap>p</keycap></term> + <term><keycap>t</keycap></term> + <term><keycap>c</keycap></term> + <term><keycap>m</keycap></term> + <term><keycap>i</keycap></term> <listitem><para>Sort the control groups by path, number of - tasks, CPU load, memory usage, or IO load, respectively. - </para></listitem> + tasks, CPU load, memory usage, or IO load, respectively. This + setting may also be controlled using the + <option>--order=</option> command line + switch.</para></listitem> </varlistentry> <varlistentry> - <term>%</term> + <term><keycap>%</keycap></term> <listitem><para>Toggle between showing CPU time as time or - percentage.</para></listitem> + percentage. This setting may also be controlled using the + <option>--cpu=</option> command line switch.</para></listitem> </varlistentry> <varlistentry> - <term>+</term> - <term>-</term> + <term><keycap>+</keycap></term> + <term><keycap>-</keycap></term> <listitem><para>Increase or decrease refresh delay, - respectively.</para></listitem> + respectively. This setting may also be controlled using the + <option>--delay=</option> command line + switch.</para></listitem> + </varlistentry> + + <varlistentry> + <term><keycap>k</keycap></term> + + <listitem><para>Toggle between including or excluding kernel + threads in control group task counts. This setting may also be + controlled using the <option>-k</option> command line + switch.</para></listitem> + </varlistentry> + + <varlistentry> + <term><keycap>r</keycap></term> + + <listitem><para>Toggle between recursively including or + excluding tasks in child control groups in control group task + counts. This setting may also be controlled using the + <option>--recursive=</option> command line + switch.</para></listitem> </varlistentry> </variablelist> diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 4966749259..6165fe1357 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -576,12 +576,15 @@ <term><option>--bind-ro=</option></term> <listitem><para>Bind mount a file or directory from the host - into the container. Either takes a path argument -- in which + into the container. Takes one of: a path argument -- in which case the specified path will be mounted from the host to the same path in the container --, or a colon-separated pair of paths -- in which case the first specified path is the source in the host, and the second path is the destination in the - container. Backslash escapes are interpreted so + container --, or a colon-separated triple of source path, + destination path and mount options. Mount options are comma + separated and currently only "rbind" and "norbind" + are allowed. Defaults to "rbind". Backslash escapes are interpreted so <literal>\:</literal> may be used to embed colons in either path. This option may be specified multiple times for creating multiple independent bind mount points. The diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml index 27662456ea..96dc4f6620 100644 --- a/man/systemd-resolved.service.xml +++ b/man/systemd-resolved.service.xml @@ -61,15 +61,22 @@ resolver and an LLMNR resolver and responder. It also generates <filename>/run/systemd/resolve/resolv.conf</filename> for compatibility which may be symlinked from - <filename>/etc/resolv.conf</filename>.</para> + <filename>/etc/resolv.conf</filename>. The glibc NSS module + <citerefentry><refentrytitle>nss-resolve</refentrytitle><manvolnum>8</manvolnum></citerefentry> + is necessary to allow libc's NSS resolver functions to resolve + host names via <command>systemd-resolved</command>.</para> <para>The DNS servers contacted are determined from the global - settings in - <citerefentry><refentrytitle>resolved.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>, - the per-link static settings in <filename>.network</filename> - files, and the per-link dynamic settings received over DHCP. See + settings in <filename>/etc/systemd/resolved.conf</filename>, the + per-link static settings in <filename>/etc/systemd/network/*.network</filename> files, + and the per-link dynamic settings received over DHCP. See + <citerefentry><refentrytitle>resolved.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> + and <citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry> - for more details.</para> + for details. To improve compatibility + <filename>/etc/resolv.conf</filename> is read in order to discover + configured system DNS servers, however only if it is not a symlink + to <filename>/run/systemd/resolve/resolv.conf</filename> (see above).</para> <para><command>systemd-resolved</command> synthesizes DNS RRs for the following cases:</para> @@ -137,6 +144,7 @@ <para> <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>resolved.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>, + <citerefentry><refentrytitle>nss-resolve</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry> </para> diff --git a/man/systemd.network.xml b/man/systemd.network.xml index ded2c0ceff..2fb4733494 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -684,6 +684,23 @@ <variablelist class='network-directives'> <varlistentry> + <term><varname>PoolOffset=</varname></term> + <term><varname>PoolSize=</varname></term> + + <listitem><para>Configures the pool of addresses to hand out. The pool + is a contiguous sequence of IP addresses in the subnet configured for + the server address, which does not include the subnet nor the broadcast + address. <varname>PoolOffset=</varname> takes the offset of the pool + from the start of subnet, or zero to use the default value. + <varname>PoolSize=</varname> takes the number of IP addresses in the + pool or zero to use the default value. By default the pool starts at + the first address after the subnet address and takes up the rest of + the subnet, excluding the broadcast address. If the pool includes + the server address (the default), this is reserved and not handed + out to clients.</para></listitem> + </varlistentry> + + <varlistentry> <term><varname>DefaultLeaseTimeSec=</varname></term> <term><varname>MaxLeaseTimeSec=</varname></term> |