diff options
Diffstat (limited to 'man')
39 files changed, 426 insertions, 274 deletions
diff --git a/man/journalctl.xml b/man/journalctl.xml index 63b4a267b8..5e682ea9ec 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -412,7 +412,7 @@ <term><option>--quiet</option></term> <listitem><para>Suppresses all info messages - (i.e. "-- Logs begin at ...", "-- Reboot --"), + (i.e. "-- Logs begin at …", "-- Reboot --"), any warning messages regarding inaccessible system journals when run as a normal user.</para></listitem> @@ -573,7 +573,7 @@ <listitem><para>The cursor is shown after the last entry after two dashes:</para> - <programlisting>-- cursor: s=0639...</programlisting> + <programlisting>-- cursor: s=0639…</programlisting> <para>The format of the cursor is private and subject to change.</para></listitem> </varlistentry> @@ -731,7 +731,7 @@ <varlistentry> <term><option>--list-catalog - <optional><replaceable>128-bit-ID...</replaceable></optional> + <optional><replaceable>128-bit-ID…</replaceable></optional> </option></term> <listitem><para>List the contents of the message catalog as a @@ -745,7 +745,7 @@ <varlistentry> <term><option>--dump-catalog - <optional><replaceable>128-bit-ID...</replaceable></optional> + <optional><replaceable>128-bit-ID…</replaceable></optional> </option></term> <listitem><para>Show the contents of the message catalog, with diff --git a/man/journald.conf.xml b/man/journald.conf.xml index 9daa964803..209d857234 100644 --- a/man/journald.conf.xml +++ b/man/journald.conf.xml @@ -227,7 +227,7 @@ rotated journal files are kept as history.</para> <para>Specify values in bytes or use K, M, G, T, P, E as - units for the specified sizes (equal to 1024, 1024², ... bytes). + units for the specified sizes (equal to 1024, 1024², … bytes). Note that size limits are enforced synchronously when journal files are extended, and no explicit rotation step triggered by time is needed.</para> diff --git a/man/localectl.xml b/man/localectl.xml index 31238272f3..7da12c29de 100644 --- a/man/localectl.xml +++ b/man/localectl.xml @@ -127,7 +127,7 @@ </varlistentry> <varlistentry> - <term><command>set-locale LOCALE...</command></term> + <term><command>set-locale LOCALE…</command></term> <listitem><para>Set the system locale. This takes one or more assignments such as "LANG=de_DE.utf8", diff --git a/man/loginctl.xml b/man/loginctl.xml index fb51740503..534a0d961e 100644 --- a/man/loginctl.xml +++ b/man/loginctl.xml @@ -191,7 +191,7 @@ </varlistentry> <varlistentry> - <term><command>session-status</command> <optional><replaceable>ID</replaceable>...</optional></term> + <term><command>session-status</command> <optional><replaceable>ID</replaceable>…</optional></term> <listitem><para>Show terse runtime status information about one or more sessions, followed by the most recent log data @@ -204,7 +204,7 @@ </varlistentry> <varlistentry> - <term><command>show-session</command> <optional><replaceable>ID</replaceable>...</optional></term> + <term><command>show-session</command> <optional><replaceable>ID</replaceable>…</optional></term> <listitem><para>Show properties of one or more sessions or the manager itself. If no argument is specified, properties of the @@ -229,8 +229,8 @@ </varlistentry> <varlistentry> - <term><command>lock-session</command> <optional><replaceable>ID</replaceable>...</optional></term> - <term><command>unlock-session</command> <optional><replaceable>ID</replaceable>...</optional></term> + <term><command>lock-session</command> <optional><replaceable>ID</replaceable>…</optional></term> + <term><command>unlock-session</command> <optional><replaceable>ID</replaceable>…</optional></term> <listitem><para>Activates/deactivates the screen lock on one or more sessions, if the session supports it. Takes one or @@ -248,7 +248,7 @@ </varlistentry> <varlistentry> - <term><command>terminate-session</command> <replaceable>ID</replaceable>...</term> + <term><command>terminate-session</command> <replaceable>ID</replaceable>…</term> <listitem><para>Terminates a session. This kills all processes of the session and deallocates all resources attached to the @@ -256,7 +256,7 @@ </varlistentry> <varlistentry> - <term><command>kill-session</command> <replaceable>ID</replaceable>...</term> + <term><command>kill-session</command> <replaceable>ID</replaceable>…</term> <listitem><para>Send a signal to one or more processes of the session. Use <option>--kill-who=</option> to select which @@ -274,7 +274,7 @@ </varlistentry> <varlistentry> - <term><command>user-status</command> <optional><replaceable>USER</replaceable>...</optional></term> + <term><command>user-status</command> <optional><replaceable>USER</replaceable>…</optional></term> <listitem><para>Show terse runtime status information about one or more logged in users, followed by the most recent log @@ -288,7 +288,7 @@ </varlistentry> <varlistentry> - <term><command>show-user</command> <optional><replaceable>USER</replaceable>...</optional></term> + <term><command>show-user</command> <optional><replaceable>USER</replaceable>…</optional></term> <listitem><para>Show properties of one or more users or the manager itself. If no argument is specified, properties of the @@ -303,8 +303,8 @@ </varlistentry> <varlistentry> - <term><command>enable-linger</command> <optional><replaceable>USER</replaceable>...</optional></term> - <term><command>disable-linger</command> <optional><replaceable>USER</replaceable>...</optional></term> + <term><command>enable-linger</command> <optional><replaceable>USER</replaceable>…</optional></term> + <term><command>disable-linger</command> <optional><replaceable>USER</replaceable>…</optional></term> <listitem><para>Enable/disable user lingering for one or more users. If enabled for a specific user, a user manager is @@ -320,7 +320,7 @@ </varlistentry> <varlistentry> - <term><command>terminate-user</command> <replaceable>USER</replaceable>...</term> + <term><command>terminate-user</command> <replaceable>USER</replaceable>…</term> <listitem><para>Terminates all sessions of a user. This kills all processes of all sessions of the user and deallocates all @@ -328,7 +328,7 @@ </varlistentry> <varlistentry> - <term><command>kill-user</command> <replaceable>USER</replaceable>...</term> + <term><command>kill-user</command> <replaceable>USER</replaceable>…</term> <listitem><para>Send a signal to all processes of a user. Use <option>--signal=</option> to select the signal to send. @@ -345,7 +345,7 @@ </varlistentry> <varlistentry> - <term><command>seat-status</command> <optional><replaceable>NAME</replaceable>...</optional></term> + <term><command>seat-status</command> <optional><replaceable>NAME</replaceable>…</optional></term> <listitem><para>Show terse runtime status information about one or more seats. Takes one or more seat names as parameters. @@ -357,7 +357,7 @@ </varlistentry> <varlistentry> - <term><command>show-seat</command> <optional><replaceable>NAME</replaceable>...</optional></term> + <term><command>show-seat</command> <optional><replaceable>NAME</replaceable>…</optional></term> <listitem><para>Show properties of one or more seats or the manager itself. If no argument is specified, properties of the @@ -372,7 +372,7 @@ </varlistentry> <varlistentry> - <term><command>attach</command> <replaceable>NAME</replaceable> <replaceable>DEVICE</replaceable>...</term> + <term><command>attach</command> <replaceable>NAME</replaceable> <replaceable>DEVICE</replaceable>…</term> <listitem><para>Persistently attach one or more devices to a seat. The devices should be specified via device paths in the @@ -396,7 +396,7 @@ </varlistentry> <varlistentry> - <term><command>terminate-seat</command> <replaceable>NAME</replaceable>...</term> + <term><command>terminate-seat</command> <replaceable>NAME</replaceable>…</term> <listitem><para>Terminates all sessions on a seat. This kills all processes of all sessions on the seat and deallocates all @@ -426,9 +426,9 @@ fatima (1005) Sessions: 5 *3 Unit: user-1005.slice ├─user@1005.service - ... + … ├─session-3.scope - ... + … └─session-5.scope ├─3473 login -- fatima └─3515 -zsh diff --git a/man/machine-id.xml b/man/machine-id.xml index a722649de4..3c261bffcc 100644 --- a/man/machine-id.xml +++ b/man/machine-id.xml @@ -71,13 +71,14 @@ <para>This machine ID adheres to the same format and logic as the D-Bus machine ID.</para> - <para>This ID uniquely identifies the host. It should be considered "confidential", and must not - be exposed in untrusted environments, in particular on the network. If a stable unique - identifier that is tied to the machine is needed for some application, the machine ID or any - part of it must not be used directly. Instead the machine ID should be hashed with a - cryptographic, keyed hash function, using a fixed, application-specific key. That way the ID - will be properly unique, and derived in a constant way from the machine ID but there will be no - way to retrieve the original machine ID from the application-specific one.</para> + <para>This ID uniquely identifies the host. It should be considered "confidential", and must not be exposed in + untrusted environments, in particular on the network. If a stable unique identifier that is tied to the machine is + needed for some application, the machine ID or any part of it must not be used directly. Instead the machine ID + should be hashed with a cryptographic, keyed hash function, using a fixed, application-specific key. That way the + ID will be properly unique, and derived in a constant way from the machine ID but there will be no way to retrieve + the original machine ID from the application-specific one. The + <citerefentry><refentrytitle>sd_id128_get_machine_app_specific</refentrytitle><manvolnum>3</manvolnum></citerefentry> + API provides an implementation of such an algorithm.</para> <para>The <citerefentry><refentrytitle>systemd-machine-id-setup</refentrytitle><manvolnum>1</manvolnum></citerefentry> diff --git a/man/machinectl.xml b/man/machinectl.xml index 81192417d8..8bebdcf9a1 100644 --- a/man/machinectl.xml +++ b/man/machinectl.xml @@ -292,7 +292,7 @@ Defaults to 1. All addresses can be requested with <literal>all</literal> as argument to <option>--max-addresses</option> . If the argument to <option>--max-addresses</option> is less than the actual number - of addresses,<literal>...</literal>follows the last address. + of addresses, <literal>...</literal>follows the last address. If multiple addresses are to be written for a given machine, every address except the first one is on a new line and is followed by <literal>,</literal> if another address will be output afterwards. </para></listitem> @@ -327,7 +327,7 @@ </varlistentry> <varlistentry> - <term><command>status</command> <replaceable>NAME</replaceable>...</term> + <term><command>status</command> <replaceable>NAME</replaceable>…</term> <listitem><para>Show runtime status information about one or more virtual machines and containers, followed by the @@ -341,7 +341,7 @@ </varlistentry> <varlistentry> - <term><command>show</command> [<replaceable>NAME</replaceable>...]</term> + <term><command>show</command> [<replaceable>NAME</replaceable>…]</term> <listitem><para>Show properties of one or more registered virtual machines or containers or the manager itself. If no argument is specified, properties of the manager will be shown. If a NAME is specified, @@ -353,7 +353,7 @@ </varlistentry> <varlistentry> - <term><command>start</command> <replaceable>NAME</replaceable>...</term> + <term><command>start</command> <replaceable>NAME</replaceable>…</term> <listitem><para>Start a container as a system service, using <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>. @@ -410,7 +410,7 @@ </varlistentry> <varlistentry> - <term><command>shell</command> [[<replaceable>NAME</replaceable>@]<replaceable>NAME</replaceable> [<replaceable>PATH</replaceable> [<replaceable>ARGUMENTS</replaceable>...]]] </term> + <term><command>shell</command> [[<replaceable>NAME</replaceable>@]<replaceable>NAME</replaceable> [<replaceable>PATH</replaceable> [<replaceable>ARGUMENTS</replaceable>…]]] </term> <listitem><para>Open an interactive shell session in a container or on the local host. The first argument refers to @@ -449,8 +449,8 @@ </varlistentry> <varlistentry> - <term><command>enable</command> <replaceable>NAME</replaceable>...</term> - <term><command>disable</command> <replaceable>NAME</replaceable>...</term> + <term><command>enable</command> <replaceable>NAME</replaceable>…</term> + <term><command>disable</command> <replaceable>NAME</replaceable>…</term> <listitem><para>Enable or disable a container as a system service to start at system boot, using @@ -463,7 +463,7 @@ </varlistentry> <varlistentry> - <term><command>poweroff</command> <replaceable>NAME</replaceable>...</term> + <term><command>poweroff</command> <replaceable>NAME</replaceable>…</term> <listitem><para>Power off one or more containers. This will trigger a reboot by sending SIGRTMIN+4 to the container's init @@ -478,7 +478,7 @@ </varlistentry> <varlistentry> - <term><command>reboot</command> <replaceable>NAME</replaceable>...</term> + <term><command>reboot</command> <replaceable>NAME</replaceable>…</term> <listitem><para>Reboot one or more containers. This will trigger a reboot by sending SIGINT to the container's init @@ -488,7 +488,7 @@ </varlistentry> <varlistentry> - <term><command>terminate</command> <replaceable>NAME</replaceable>...</term> + <term><command>terminate</command> <replaceable>NAME</replaceable>…</term> <listitem><para>Immediately terminates a virtual machine or container, without cleanly shutting it down. This kills all @@ -499,7 +499,7 @@ </varlistentry> <varlistentry> - <term><command>kill</command> <replaceable>NAME</replaceable>...</term> + <term><command>kill</command> <replaceable>NAME</replaceable>…</term> <listitem><para>Send a signal to one or more processes of the virtual machine or container. This means processes as seen by @@ -568,7 +568,7 @@ </varlistentry> <varlistentry> - <term><command>image-status</command> [<replaceable>NAME</replaceable>...]</term> + <term><command>image-status</command> [<replaceable>NAME</replaceable>…]</term> <listitem><para>Show terse status information about one or more container or VM images. This function is intended to @@ -578,7 +578,7 @@ </varlistentry> <varlistentry> - <term><command>show-image</command> [<replaceable>NAME</replaceable>...]</term> + <term><command>show-image</command> [<replaceable>NAME</replaceable>…]</term> <listitem><para>Show properties of one or more registered virtual machine or container images, or the manager itself. If @@ -630,7 +630,7 @@ </varlistentry> <varlistentry> - <term><command>remove</command> <replaceable>NAME</replaceable>...</term> + <term><command>remove</command> <replaceable>NAME</replaceable>…</term> <listitem><para>Removes one or more container or VM images. The special image <literal>.host</literal>, which refers to @@ -849,7 +849,7 @@ </varlistentry> <varlistentry> - <term><command>cancel-transfers</command> <replaceable>ID</replaceable>...</term> + <term><command>cancel-transfers</command> <replaceable>ID</replaceable>…</term> <listitem><para>Aborts a download, import or export of the container or VM image with the specified ID. To list ongoing diff --git a/man/networkctl.xml b/man/networkctl.xml index 24e1de6986..809eb7ec6a 100644 --- a/man/networkctl.xml +++ b/man/networkctl.xml @@ -102,7 +102,7 @@ <varlistentry> <term> <command>list</command> - <optional><replaceable>LINK...</replaceable></optional> + <optional><replaceable>LINK…</replaceable></optional> </term> <listitem> @@ -122,7 +122,7 @@ <varlistentry> <term> <command>status</command> - <optional><replaceable>LINK...</replaceable></optional> + <optional><replaceable>LINK…</replaceable></optional> </term> <listitem> @@ -150,7 +150,7 @@ <varlistentry> <term> <command>lldp</command> - <optional><replaceable>LINK...</replaceable></optional> + <optional><replaceable>LINK…</replaceable></optional> </term> <listitem> diff --git a/man/sd_bus_error.xml b/man/sd_bus_error.xml index c2d7ee389b..3091e1f019 100644 --- a/man/sd_bus_error.xml +++ b/man/sd_bus_error.xml @@ -68,7 +68,7 @@ <funcsynopsisinfo>typedef struct { const char *name; const char *message; - ... + … } sd_bus_error;</funcsynopsisinfo> <para> @@ -95,7 +95,7 @@ <paramdef>sd_bus_error *<parameter>e</parameter></paramdef> <paramdef>const char *<parameter>name</parameter></paramdef> <paramdef>const char *<parameter>format</parameter></paramdef> - <paramdef>...</paramdef> + <paramdef>…</paramdef> </funcprototype> <funcprototype> @@ -116,7 +116,7 @@ <paramdef>sd_bus_error *<parameter>e</parameter></paramdef> <paramdef>int <parameter>error</parameter></paramdef> <paramdef>const char *<parameter>format</parameter></paramdef> - <paramdef>...</paramdef> + <paramdef>…</paramdef> </funcprototype> <funcprototype> diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml index 139bd77d8c..a1eda21ed5 100644 --- a/man/sd_bus_error_add_map.xml +++ b/man/sd_bus_error_add_map.xml @@ -58,7 +58,7 @@ <funcsynopsisinfo>typedef struct { const char *name; int code; - ... + … } sd_bus_error_map;</funcsynopsisinfo> </funcsynopsis> diff --git a/man/sd_bus_message_append.xml b/man/sd_bus_message_append.xml index c222d0fd0e..132ce66434 100644 --- a/man/sd_bus_message_append.xml +++ b/man/sd_bus_message_append.xml @@ -58,7 +58,7 @@ <funcdef>int sd_bus_message_append</funcdef> <paramdef>sd_bus_message *<parameter>m</parameter></paramdef> <paramdef>const char *<parameter>types</parameter></paramdef> - <paramdef>...</paramdef> + <paramdef>…</paramdef> </funcprototype> </funcsynopsis> </refsynopsisdiv> @@ -198,7 +198,7 @@ dictionary ::= "a" "{" basic_type complete_type "}" </para> <programlisting>sd_bus_message *m; -... +… sd_bus_message_append(m, "s", "a string");</programlisting> <para>Append all types of integers:</para> diff --git a/man/sd_bus_path_encode.xml b/man/sd_bus_path_encode.xml index 3088243e45..986eccc6a8 100644 --- a/man/sd_bus_path_encode.xml +++ b/man/sd_bus_path_encode.xml @@ -66,7 +66,7 @@ <funcdef>int <function>sd_bus_path_encode_many</function></funcdef> <paramdef>char **<parameter>out</parameter></paramdef> <paramdef>const char *<parameter>path_template</parameter></paramdef> - <paramdef>...</paramdef> + <paramdef>…</paramdef> </funcprototype> <funcprototype> @@ -80,7 +80,7 @@ <funcdef>int <function>sd_bus_path_decode_many</function></funcdef> <paramdef>const char *<parameter>path</parameter></paramdef> <paramdef>const char *<parameter>path_template</parameter></paramdef> - <paramdef>...</paramdef> + <paramdef>…</paramdef> </funcprototype> </funcsynopsis> </refsynopsisdiv> diff --git a/man/sd_event_add_defer.xml b/man/sd_event_add_defer.xml index d9ebd3b179..ab28b330fe 100644 --- a/man/sd_event_add_defer.xml +++ b/man/sd_event_add_defer.xml @@ -153,7 +153,7 @@ <refsect1> <title>Return Value</title> - <para>On success, this functions return 0 or a positive + <para>On success, these functions return 0 or a positive integer. On failure, they return a negative errno-style error code.</para> </refsect1> diff --git a/man/sd_event_source_set_prepare.xml b/man/sd_event_source_set_prepare.xml index 24861d01d9..ee61d23983 100644 --- a/man/sd_event_source_set_prepare.xml +++ b/man/sd_event_source_set_prepare.xml @@ -76,10 +76,11 @@ specified as <parameter>callback</parameter> will be invoked immediately before the event loop goes to sleep to wait for incoming events. It is invoked with the user data pointer passed - when the event source was created. The callback function may be - used to reconfigure the precise events to wait for. If the - <parameter>callback</parameter> parameter is passed as NULL the - callback function is reset. </para> + when the event source was created. The event source will be disabled + if the callback function returns a negative error code. The callback + function may be used to reconfigure the precise events to wait for. + If the <parameter>callback</parameter> parameter is passed as NULL + the callback function is reset. </para> <para>Event source objects have no preparation callback associated when they are first created with calls such as diff --git a/man/sd_id128_get_machine.xml b/man/sd_id128_get_machine.xml index 9a86c24aed..3938c6d836 100644 --- a/man/sd_id128_get_machine.xml +++ b/man/sd_id128_get_machine.xml @@ -44,6 +44,7 @@ <refnamediv> <refname>sd_id128_get_machine</refname> + <refname>sd_id128_get_machine_app_specific</refname> <refname>sd_id128_get_boot</refname> <refname>sd_id128_get_invocation</refname> <refpurpose>Retrieve 128-bit IDs</refpurpose> @@ -59,6 +60,12 @@ </funcprototype> <funcprototype> + <funcdef>int <function>sd_id128_get_machine_app_specific</function></funcdef> + <paramdef>sd_id128_t <parameter>app_id</parameter></paramdef> + <paramdef>sd_id128_t *<parameter>ret</parameter></paramdef> + </funcprototype> + + <funcprototype> <funcdef>int <function>sd_id128_get_boot</function></funcdef> <paramdef>sd_id128_t *<parameter>ret</parameter></paramdef> </funcprototype> @@ -74,11 +81,22 @@ <refsect1> <title>Description</title> - <para><function>sd_id128_get_machine()</function> returns the - machine ID of the executing host. This reads and parses the - <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry> - file. This function caches the machine ID internally to make - retrieving the machine ID a cheap operation.</para> + <para><function>sd_id128_get_machine()</function> returns the machine ID of the executing host. This reads and + parses the <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry> + file. This function caches the machine ID internally to make retrieving the machine ID a cheap operation. This ID + may be used wherever a unique identifier for the local system is needed. However, it is recommended to use this ID + as-is only in trusted environments. In untrusted environments it is recommended to derive an application specific + ID from this machine ID, in an irreversable (cryptographically secure) way. To make this easy + <function>sd_id128_get_machine_app_specific()</function> is provided, see below.</para> + + <para><function>sd_id128_get_machine_app_specific()</function> is similar to + <function>sd_id128_get_machine()</function>, but retrieves a machine ID that is specific to the application that is + identified by the indicated application ID. It is recommended to use this function instead of + <function>sd_id128_get_machine()</function> when passing an ID to untrusted environments, in order to make sure + that the original machine ID may not be determined externally. The application-specific ID should be generated via + a tool like <command>journalctl --new-id128</command>, and may be compiled into the application. This function will + return the same application-specific ID for each combination of machine ID and application ID. Internally, this + function calculates HMAC-SHA256 of the application ID, keyed by the machine ID.</para> <para><function>sd_id128_get_boot()</function> returns the boot ID of the executing kernel. This reads and parses the @@ -95,10 +113,10 @@ <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details. The ID is cached internally. In future a different mechanism to determine the invocation ID may be added.</para> - <para>Note that <function>sd_id128_get_boot()</function> and <function>sd_id128_get_invocation()</function> always - return UUID v4 compatible IDs. <function>sd_id128_get_machine()</function> will also return a UUID v4-compatible - ID on new installations but might not on older. It is possible to convert the machine ID into a UUID v4-compatible - one. For more information, see + <para>Note that <function>sd_id128_get_machine_app_specific()</function>, <function>sd_id128_get_boot()</function> + and <function>sd_id128_get_invocation()</function> always return UUID v4 compatible IDs. + <function>sd_id128_get_machine()</function> will also return a UUID v4-compatible ID on new installations but might + not on older. It is possible to convert the machine ID into a UUID v4-compatible one. For more information, see <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para> <para>For more information about the <literal>sd_id128_t</literal> @@ -117,13 +135,36 @@ <refsect1> <title>Notes</title> - <para>The <function>sd_id128_get_machine()</function>, <function>sd_id128_get_boot()</function> and - <function>sd_id128_get_invocation()</function> interfaces are available as a shared library, which can be compiled - and linked to with the <literal>libsystemd</literal> <citerefentry + <para>The <function>sd_id128_get_machine()</function>, <function>sd_id128_get_machine_app_specific()</function> + <function>sd_id128_get_boot()</function> and <function>sd_id128_get_invocation()</function> interfaces are + available as a shared library, which can be compiled and linked to with the + <literal>libsystemd</literal> <citerefentry project='die-net'><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry> file.</para> </refsect1> <refsect1> + <title>Examples</title> + + <example> + <title>Application-specific machine ID</title> + + <para>Here's a simple example for an application specific machine ID:</para> + + <programlisting>#include <systemd/sd-id128.h> +#include <stdio.h> + +#define OUR_APPLICATION_ID SD_ID128_MAKE(c2,73,27,73,23,db,45,4e,a6,3b,b9,6e,79,b5,3e,97) + +int main(int argc, char *argv[]) { + sd_id128_t id; + sd_id128_get_machine_app_specific(OUR_APPLICATION_ID, &id); + printf("Our application ID: " SD_ID128_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(id)); + return 0; +}</programlisting> + </example> + </refsect1> + + <refsect1> <title>See Also</title> <para> diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml index 7ff02cbfec..991c7f8bd8 100644 --- a/man/sd_is_fifo.xml +++ b/man/sd_is_fifo.xml @@ -118,10 +118,10 @@ <parameter>family</parameter> parameter is not <constant>AF_UNSPEC</constant>, it is checked whether the socket is of the specified family (<constant>AF_UNIX</constant>, - <constant>AF_INET</constant>, ...). If the <parameter>type</parameter> + <constant>AF_INET</constant>, …). If the <parameter>type</parameter> parameter is not 0, it is checked whether the socket is of the specified type (<constant>SOCK_STREAM</constant>, - <constant>SOCK_DGRAM</constant>, ...). If the + <constant>SOCK_DGRAM</constant>, …). If the <parameter>listening</parameter> parameter is positive, it is checked whether the socket is in accepting mode, i.e. <function>listen()</function> has been called for it. If diff --git a/man/sd_journal_add_match.xml b/man/sd_journal_add_match.xml index 7c64329aed..2294b43643 100644 --- a/man/sd_journal_add_match.xml +++ b/man/sd_journal_add_match.xml @@ -190,7 +190,7 @@ message ID 03bb1dab98ab4ecfbf6fff2738bdd964 coming from any service (this example lacks the necessary error checking):</para> - <programlisting>... + <programlisting>… int add_matches(sd_journal *j) { sd_journal_add_match(j, "_SYSTEMD_UNIT=avahi-daemon.service", 0); sd_journal_add_match(j, "PRIORITY=0", 0); diff --git a/man/sd_journal_get_data.xml b/man/sd_journal_get_data.xml index 1321114de0..01e436e70d 100644 --- a/man/sd_journal_get_data.xml +++ b/man/sd_journal_get_data.xml @@ -207,14 +207,14 @@ iterate through all fields of the current journal entry:</para> - <programlisting>... + <programlisting>… int print_fields(sd_journal *j) { const void *data; size_t length; SD_JOURNAL_FOREACH_DATA(j, data, length) printf("%.*s\n", (int) length, data); } -...</programlisting> +…</programlisting> </refsect1> diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml index 2d8dd635aa..5538805e65 100644 --- a/man/sd_journal_print.xml +++ b/man/sd_journal_print.xml @@ -60,7 +60,7 @@ <funcdef>int <function>sd_journal_print</function></funcdef> <paramdef>int <parameter>priority</parameter></paramdef> <paramdef>const char *<parameter>format</parameter></paramdef> - <paramdef>...</paramdef> + <paramdef>…</paramdef> </funcprototype> <funcprototype> @@ -73,7 +73,7 @@ <funcprototype> <funcdef>int <function>sd_journal_send</function></funcdef> <paramdef>const char *<parameter>format</parameter></paramdef> - <paramdef>...</paramdef> + <paramdef>…</paramdef> </funcprototype> <funcprototype> diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml index 93bf8d853f..c1c2423884 100644 --- a/man/sd_listen_fds.xml +++ b/man/sd_listen_fds.xml @@ -79,7 +79,7 @@ received, zero is returned. The first file descriptor may be found at file descriptor number 3 (i.e. <constant>SD_LISTEN_FDS_START</constant>), the remaining - descriptors follow at 4, 5, 6, ..., if any.</para> + descriptors follow at 4, 5, 6, …, if any.</para> <para>If a daemon receives more than one file descriptor, they will be passed in the same order as configured in the systemd diff --git a/man/sd_notify.xml b/man/sd_notify.xml index 94542b80b8..6e98041912 100644 --- a/man/sd_notify.xml +++ b/man/sd_notify.xml @@ -66,7 +66,7 @@ <funcdef>int <function>sd_notifyf</function></funcdef> <paramdef>int <parameter>unset_environment</parameter></paramdef> <paramdef>const char *<parameter>format</parameter></paramdef> - <paramdef>...</paramdef> + <paramdef>…</paramdef> </funcprototype> <funcprototype> @@ -81,7 +81,7 @@ <paramdef>pid_t <parameter>pid</parameter></paramdef> <paramdef>int <parameter>unset_environment</parameter></paramdef> <paramdef>const char *<parameter>format</parameter></paramdef> - <paramdef>...</paramdef> + <paramdef>…</paramdef> </funcprototype> <funcprototype> @@ -152,7 +152,7 @@ </varlistentry> <varlistentry> - <term>STATUS=...</term> + <term>STATUS=…</term> <listitem><para>Passes a single-line UTF-8 status string back to the service manager that describes the service state. This @@ -160,11 +160,11 @@ state feedback, fsck-like programs could pass completion percentages and failing programs could pass a human-readable error message. Example: <literal>STATUS=Completed 66% of file - system check...</literal></para></listitem> + system check…</literal></para></listitem> </varlistentry> <varlistentry> - <term>ERRNO=...</term> + <term>ERRNO=…</term> <listitem><para>If a service fails, the errno-style error code, formatted as string. Example: <literal>ERRNO=2</literal> @@ -172,7 +172,7 @@ </varlistentry> <varlistentry> - <term>BUSERROR=...</term> + <term>BUSERROR=…</term> <listitem><para>If a service fails, the D-Bus error-style error code. Example: @@ -180,7 +180,7 @@ </varlistentry> <varlistentry> - <term>MAINPID=...</term> + <term>MAINPID=…</term> <listitem><para>The main process ID (PID) of the service, in case the service manager did not fork off the process itself. @@ -227,7 +227,7 @@ </varlistentry> <varlistentry> - <term>FDNAME=...</term> + <term>FDNAME=…</term> <listitem><para>When used in combination with <varname>FDSTORE=1</varname>, specifies a name for the @@ -248,7 +248,7 @@ </varlistentry> <varlistentry> - <term>WATCHDOG_USEC=...</term> + <term>WATCHDOG_USEC=…</term> <listitem><para>Reset <varname>watchdog_usec</varname> value during runtime. Notice that this is not available when using <function>sd_event_set_watchdog()</function> @@ -362,7 +362,7 @@ initialization:</para> <programlisting>sd_notifyf(0, "READY=1\n" - "STATUS=Processing requests...\n" + "STATUS=Processing requests…\n" "MAINPID=%lu", (unsigned long) getpid());</programlisting> </example> diff --git a/man/systemctl.xml b/man/systemctl.xml index 08c3a268bd..68c8546189 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -664,7 +664,7 @@ <variablelist> <varlistentry> - <term><command>list-units <optional><replaceable>PATTERN</replaceable>...</optional></command></term> + <term><command>list-units <optional><replaceable>PATTERN</replaceable>…</optional></command></term> <listitem> <para>List units that <command>systemd</command> currently has in memory. This includes units that are @@ -680,7 +680,7 @@ </varlistentry> <varlistentry> - <term><command>list-sockets <optional><replaceable>PATTERN</replaceable>...</optional></command></term> + <term><command>list-sockets <optional><replaceable>PATTERN</replaceable>…</optional></command></term> <listitem> <para>List socket units currently in memory, ordered by listening address. If one or more @@ -689,7 +689,7 @@ <programlisting> LISTEN UNIT ACTIVATES /dev/initctl systemd-initctl.socket systemd-initctl.service -... +… [::]:22 sshd.socket sshd.service kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service @@ -703,7 +703,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </varlistentry> <varlistentry> - <term><command>list-timers <optional><replaceable>PATTERN</replaceable>...</optional></command></term> + <term><command>list-timers <optional><replaceable>PATTERN</replaceable>…</optional></command></term> <listitem> <para>List timer units currently in memory, ordered by the time they elapse next. If one or more @@ -715,7 +715,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </varlistentry> <varlistentry> - <term><command>start <replaceable>PATTERN</replaceable>...</command></term> + <term><command>start <replaceable>PATTERN</replaceable>…</command></term> <listitem> <para>Start (activate) one or more units specified on the @@ -729,7 +729,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </listitem> </varlistentry> <varlistentry> - <term><command>stop <replaceable>PATTERN</replaceable>...</command></term> + <term><command>stop <replaceable>PATTERN</replaceable>…</command></term> <listitem> <para>Stop (deactivate) one or more units specified on the @@ -737,7 +737,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </listitem> </varlistentry> <varlistentry> - <term><command>reload <replaceable>PATTERN</replaceable>...</command></term> + <term><command>reload <replaceable>PATTERN</replaceable>…</command></term> <listitem> <para>Asks all units listed on the command line to reload @@ -757,7 +757,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </varlistentry> <varlistentry> - <term><command>restart <replaceable>PATTERN</replaceable>...</command></term> + <term><command>restart <replaceable>PATTERN</replaceable>…</command></term> <listitem> <para>Restart one or more units specified on the command @@ -766,7 +766,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </listitem> </varlistentry> <varlistentry> - <term><command>try-restart <replaceable>PATTERN</replaceable>...</command></term> + <term><command>try-restart <replaceable>PATTERN</replaceable>…</command></term> <listitem> <para>Restart one or more units specified on the command @@ -777,7 +777,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </listitem> </varlistentry> <varlistentry> - <term><command>reload-or-restart <replaceable>PATTERN</replaceable>...</command></term> + <term><command>reload-or-restart <replaceable>PATTERN</replaceable>…</command></term> <listitem> <para>Reload one or more units if they support it. If not, @@ -786,7 +786,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </listitem> </varlistentry> <varlistentry> - <term><command>try-reload-or-restart <replaceable>PATTERN</replaceable>...</command></term> + <term><command>try-reload-or-restart <replaceable>PATTERN</replaceable>…</command></term> <listitem> <para>Reload one or more units if they support it. If not, @@ -818,7 +818,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </listitem> </varlistentry> <varlistentry> - <term><command>kill <replaceable>PATTERN</replaceable>...</command></term> + <term><command>kill <replaceable>PATTERN</replaceable>…</command></term> <listitem> <para>Send a signal to one or more processes of the @@ -828,7 +828,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </listitem> </varlistentry> <varlistentry> - <term><command>is-active <replaceable>PATTERN</replaceable>...</command></term> + <term><command>is-active <replaceable>PATTERN</replaceable>…</command></term> <listitem> <para>Check whether any of the specified units are active @@ -840,7 +840,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </listitem> </varlistentry> <varlistentry> - <term><command>is-failed <replaceable>PATTERN</replaceable>...</command></term> + <term><command>is-failed <replaceable>PATTERN</replaceable>…</command></term> <listitem> <para>Check whether any of the specified units are in a @@ -852,7 +852,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </listitem> </varlistentry> <varlistentry> - <term><command>status</command> <optional><replaceable>PATTERN</replaceable>...|<replaceable>PID</replaceable>...]</optional></term> + <term><command>status</command> <optional><replaceable>PATTERN</replaceable>…|<replaceable>PID</replaceable>…]</optional></term> <listitem> <para>Show terse runtime status information about one or @@ -879,7 +879,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </listitem> </varlistentry> <varlistentry> - <term><command>show</command> <optional><replaceable>PATTERN</replaceable>...|<replaceable>JOB</replaceable>...</optional></term> + <term><command>show</command> <optional><replaceable>PATTERN</replaceable>…|<replaceable>JOB</replaceable>…</optional></term> <listitem> <para>Show properties of one or more units, jobs, or the @@ -896,7 +896,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </listitem> </varlistentry> <varlistentry> - <term><command>cat <replaceable>PATTERN</replaceable>...</command></term> + <term><command>cat <replaceable>PATTERN</replaceable>…</command></term> <listitem> <para>Show backing files of one or more units. Prints the @@ -910,7 +910,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </listitem> </varlistentry> <varlistentry> - <term><command>set-property <replaceable>NAME</replaceable> <replaceable>ASSIGNMENT</replaceable>...</command></term> + <term><command>set-property <replaceable>NAME</replaceable> <replaceable>ASSIGNMENT</replaceable>…</command></term> <listitem> <para>Set the specified unit properties at runtime where @@ -941,7 +941,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </varlistentry> <varlistentry> - <term><command>help <replaceable>PATTERN</replaceable>...|<replaceable>PID</replaceable>...</command></term> + <term><command>help <replaceable>PATTERN</replaceable>…|<replaceable>PID</replaceable>…</command></term> <listitem> <para>Show manual pages for one or more units, if @@ -951,7 +951,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </varlistentry> <varlistentry> - <term><command>reset-failed [<replaceable>PATTERN</replaceable>...]</command></term> + <term><command>reset-failed [<replaceable>PATTERN</replaceable>…]</command></term> <listitem> <para>Reset the <literal>failed</literal> state of the @@ -999,7 +999,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service <variablelist> <varlistentry> - <term><command>list-unit-files <optional><replaceable>PATTERN...</replaceable></optional></command></term> + <term><command>list-unit-files <optional><replaceable>PATTERN…</replaceable></optional></command></term> <listitem> <para>List unit files installed on the system, in combination with their enablement state (as reported by @@ -1010,8 +1010,8 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </varlistentry> <varlistentry> - <term><command>enable <replaceable>NAME</replaceable>...</command></term> - <term><command>enable <replaceable>PATH</replaceable>...</command></term> + <term><command>enable <replaceable>NAME</replaceable>…</command></term> + <term><command>enable <replaceable>PATH</replaceable>…</command></term> <listitem> <para>Enable one or more units or unit instances. This will create a set of symlinks, as encoded in the @@ -1061,7 +1061,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </varlistentry> <varlistentry> - <term><command>disable <replaceable>NAME</replaceable>...</command></term> + <term><command>disable <replaceable>NAME</replaceable>…</command></term> <listitem> <para>Disables one or more units. This removes all symlinks to the unit files backing the specified units @@ -1093,7 +1093,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </varlistentry> <varlistentry> - <term><command>reenable <replaceable>NAME</replaceable>...</command></term> + <term><command>reenable <replaceable>NAME</replaceable>…</command></term> <listitem> <para>Reenable one or more units, as specified on the command line. This is a combination of @@ -1104,7 +1104,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </varlistentry> <varlistentry> - <term><command>preset <replaceable>NAME</replaceable>...</command></term> + <term><command>preset <replaceable>NAME</replaceable>…</command></term> <listitem> <para>Reset the enable/disable status one or more unit files, as specified on @@ -1142,7 +1142,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </varlistentry> <varlistentry> - <term><command>is-enabled <replaceable>NAME</replaceable>...</command></term> + <term><command>is-enabled <replaceable>NAME</replaceable>…</command></term> <listitem> <para>Checks whether any of the specified unit files are @@ -1229,7 +1229,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </varlistentry> <varlistentry> - <term><command>mask <replaceable>NAME</replaceable>...</command></term> + <term><command>mask <replaceable>NAME</replaceable>…</command></term> <listitem> <para>Mask one or more units, as specified on the command line. This will link these unit files to @@ -1243,7 +1243,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </varlistentry> <varlistentry> - <term><command>unmask <replaceable>NAME</replaceable>...</command></term> + <term><command>unmask <replaceable>NAME</replaceable>…</command></term> <listitem> <para>Unmask one or more unit files, as specified on the command line. This will undo the effect of @@ -1253,7 +1253,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </varlistentry> <varlistentry> - <term><command>link <replaceable>PATH</replaceable>...</command></term> + <term><command>link <replaceable>PATH</replaceable>…</command></term> <listitem> <para>Link a unit file that is not in the unit file search paths into the unit file search path. This @@ -1264,7 +1264,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </varlistentry> <varlistentry> - <term><command>revert <replaceable>NAME</replaceable>...</command></term> + <term><command>revert <replaceable>NAME</replaceable>…</command></term> <listitem> <para>Revert one or more unit files to their vendor versions. This command removes drop-in configuration @@ -1287,9 +1287,9 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service <varlistentry> <term><command>add-wants <replaceable>TARGET</replaceable> - <replaceable>NAME</replaceable>...</command></term> + <replaceable>NAME</replaceable>…</command></term> <term><command>add-requires <replaceable>TARGET</replaceable> - <replaceable>NAME</replaceable>...</command></term> + <replaceable>NAME</replaceable>…</command></term> <listitem> <para>Adds <literal>Wants=</literal> or <literal>Requires=</literal> @@ -1305,7 +1305,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </varlistentry> <varlistentry> - <term><command>edit <replaceable>NAME</replaceable>...</command></term> + <term><command>edit <replaceable>NAME</replaceable>…</command></term> <listitem> <para>Edit a drop-in snippet or a whole replacement file if @@ -1372,7 +1372,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service <variablelist> <varlistentry> - <term><command>list-machines <optional><replaceable>PATTERN</replaceable>...</optional></command></term> + <term><command>list-machines <optional><replaceable>PATTERN</replaceable>…</optional></command></term> <listitem> <para>List the host and all running local containers with @@ -1390,7 +1390,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service <variablelist> <varlistentry> - <term><command>list-jobs <optional><replaceable>PATTERN...</replaceable></optional></command></term> + <term><command>list-jobs <optional><replaceable>PATTERN…</replaceable></optional></command></term> <listitem> <para>List jobs that are in progress. If one or more @@ -1403,7 +1403,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </listitem> </varlistentry> <varlistentry> - <term><command>cancel <replaceable>JOB</replaceable>...</command></term> + <term><command>cancel <replaceable>JOB</replaceable>…</command></term> <listitem> <para>Cancel one or more jobs specified on the command line @@ -1430,7 +1430,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </listitem> </varlistentry> <varlistentry> - <term><command>set-environment <replaceable>VARIABLE=VALUE</replaceable>...</command></term> + <term><command>set-environment <replaceable>VARIABLE=VALUE</replaceable>…</command></term> <listitem> <para>Set one or more systemd manager environment variables, @@ -1438,7 +1438,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service </listitem> </varlistentry> <varlistentry> - <term><command>unset-environment <replaceable>VARIABLE</replaceable>...</command></term> + <term><command>unset-environment <replaceable>VARIABLE</replaceable>…</command></term> <listitem> <para>Unset one or more systemd manager environment @@ -1451,7 +1451,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service <varlistentry> <term> <command>import-environment</command> - <optional><replaceable>VARIABLE...</replaceable></optional> + <optional><replaceable>VARIABLE…</replaceable></optional> </term> <listitem> @@ -1759,7 +1759,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service <title>Parameter Syntax</title> <para>Unit commands listed above take either a single unit name (designated as <replaceable>NAME</replaceable>), - or multiple unit specifications (designated as <replaceable>PATTERN</replaceable>...). In the first case, the + or multiple unit specifications (designated as <replaceable>PATTERN</replaceable>…). In the first case, the unit name with or without a suffix must be given. If the suffix is not specified (unit name is "abbreviated"), systemctl will append a suitable suffix, <literal>.service</literal> by default, and a type-specific suffix in case of commands which operate only on specific unit types. For example, diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml index 634e16b5f4..7d5410d693 100644 --- a/man/systemd-analyze.xml +++ b/man/systemd-analyze.xml @@ -105,7 +105,7 @@ <command>systemd-analyze</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="plain">syscall-filter</arg> - <arg choice="opt"><replaceable>SET</replaceable>...</arg> + <arg choice="opt"><replaceable>SET</replaceable>…</arg> </cmdsynopsis> <cmdsynopsis> <command>systemd-analyze</command> @@ -140,7 +140,7 @@ initialization of another service to complete.</para> <para><command>systemd-analyze critical-chain - [<replaceable>UNIT...</replaceable>]</command> prints a tree of + [<replaceable>UNIT…</replaceable>]</command> prints a tree of the time-critical chain of units (for each of the specified <replaceable>UNIT</replaceable>s or for the default target otherwise). The time after the unit is active or started is @@ -187,7 +187,7 @@ <option>--log-target=</option>, described in <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>).</para> - <para><command>systemd-analyze syscall-filter <optional><replaceable>SET</replaceable>...</optional></command> + <para><command>systemd-analyze syscall-filter <optional><replaceable>SET</replaceable>…</optional></command> will list system calls contained in the specified system call set <replaceable>SET</replaceable>, or all known sets if no sets are specified. Argument <replaceable>SET</replaceable> must include the <literal>@</literal> prefix.</para> @@ -333,7 +333,7 @@ $ eog targets.svg</programlisting> </para></listitem> <listitem><para>missing dependencies which are required to start - the given unit, </para></listitem> + the given unit,</para></listitem> <listitem><para>man pages listed in <varname>Documentation=</varname> which are not found in the diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml index 99709604aa..6628213209 100644 --- a/man/systemd-delta.xml +++ b/man/systemd-delta.xml @@ -63,7 +63,7 @@ compare configuration files that override other configuration files. Files in <filename>/etc</filename> have highest priority, files in <filename>/run</filename> have the second highest - priority, ..., files in <filename>/lib</filename> have lowest + priority, …, files in <filename>/lib</filename> have lowest priority. Files in a directory with higher priority override files with the same name in directories of lower priority. In addition, certain configuration files can have <literal>.d</literal> @@ -82,7 +82,7 @@ suffix. Either is optional. The prefix must be one of the directories containing configuration files (<filename>/etc</filename>, <filename>/run</filename>, - <filename>/usr/lib</filename>, ...). If it is given, only + <filename>/usr/lib</filename>, …). If it is given, only overriding files contained in this directory will be shown. Otherwise, all overriding files will be shown. The suffix must be a name of a subdirectory containing configuration files like diff --git a/man/systemd-journal-gatewayd.service.xml b/man/systemd-journal-gatewayd.service.xml index 2cb114f6e3..22294542f3 100644 --- a/man/systemd-journal-gatewayd.service.xml +++ b/man/systemd-journal-gatewayd.service.xml @@ -128,7 +128,7 @@ </varlistentry> <varlistentry> - <term><uri>/entries[?option1&option2=value...]</uri></term> + <term><uri>/entries[?option1&option2=value…]</uri></term> <listitem><para>Retrieval of events in various formats.</para> @@ -157,7 +157,7 @@ "hostname" : "fedora", "os_pretty_name" : "Fedora 19 (Rawhide)", "virtualization" : "kvm", - ...}</programlisting> + …}</programlisting> </para> </listitem> </varlistentry> diff --git a/man/systemd-notify.xml b/man/systemd-notify.xml index a5f4077166..4a8e119eb6 100644 --- a/man/systemd-notify.xml +++ b/man/systemd-notify.xml @@ -112,7 +112,7 @@ <listitem><para>Send a free-form status string for the daemon to the init systemd. This option takes the status string as argument. This is equivalent to <command>systemd-notify - STATUS=...</command>. For details about the semantics of this + STATUS=…</command>. For details about the semantics of this option see <citerefentry><refentrytitle>sd_notify</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para></listitem> </varlistentry> @@ -158,15 +158,15 @@ <programlisting>#!/bin/bash mkfifo /tmp/waldo -systemd-notify --ready --status="Waiting for data..." +systemd-notify --ready --status="Waiting for data…" while : ; do read a < /tmp/waldo systemd-notify --status="Processing $a" - # Do something with $a ... + # Do something with $a … - systemd-notify --status="Waiting for data..." + systemd-notify --status="Waiting for data…" done</programlisting> </example> </refsect1> diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index dbbf9890c8..2bc81ea1aa 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -235,17 +235,34 @@ identified by the partition types defined by the <ulink url="http://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/">Discoverable Partitions Specification</ulink>.</para></listitem> + + <listitem><para>No partition table, and a single file system spanning the whole image.</para></listitem> </itemizedlist> <para>On GPT images, if an EFI System Partition (ESP) is discovered, it is automatically mounted to <filename>/efi</filename> (or <filename>/boot</filename> as fallback) in case a directory by this name exists and is empty.</para> + <para>Partitions encrypted with LUKS are automatically decrypted. Also, on GPT images dm-verity data integrity + hash partitions are set up if the root hash for them is specified using the <option>--root-hash=</option> + option.</para> + <para>Any other partitions, such as foreign partitions or swap partitions are not mounted. May not be specified together with <option>--directory=</option>, <option>--template=</option>.</para></listitem> </varlistentry> <varlistentry> + <term><option>--root-hash=</option></term> + + <listitem><para>Takes a data integrity (dm-verity) root hash specified in hexadecimal. This option enables data + integrity checks using dm-verity, if the used image contains the appropriate integrity data (see above). The + specified hash must match the root hash of integrity data, and is usually at least 256bits (and hence 64 + hexadecimal characters) long (in case of SHA256 for example). If this option is not specified, but a file with + the <filename>.roothash</filename> suffix is found next to the image file, bearing otherwise the same name the + root hash is read from it and automatically used.</para></listitem> + </varlistentry> + + <varlistentry> <term><option>-a</option></term> <term><option>--as-pid2</option></term> @@ -740,21 +757,19 @@ <term><option>--bind=</option></term> <term><option>--bind-ro=</option></term> - <listitem><para>Bind mount a file or directory from the host - 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 —, 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 - <option>--bind-ro=</option> option creates read-only bind - mounts.</para></listitem> + <listitem><para>Bind mount a file or directory from the host 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, or a colon-separated triple of source path, destination path + and mount options. The source path may optionally be prefixed with a <literal>+</literal> character. If so, the + source path is taken relative to the image's root directory. This permits setting up bind mounts within the + container image. The source path may be specified as empty string, in which case a temporary directory below + the host's <filename>/var/tmp</filename> directory is used. It is automatically removed when the container is + shut down. Mount options are comma-separated and currently, only <option>rbind</option> and + <option>norbind</option> are allowed, controlling whether to create a recursive or a regular bind + mount. 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 <option>--bind-ro=</option> option creates read-only bind mounts.</para></listitem> </varlistentry> <varlistentry> @@ -808,6 +823,14 @@ point for the overlay file system in the container. At least two paths have to be specified.</para> + <para>The source paths may optionally be prefixed with <literal>+</literal> character. If so they are taken + relative to the image's root directory. The uppermost source path may also be specified as empty string, in + which case a temporary directory below the host's <filename>/var/tmp</filename> is used. The directory is + removed automatically when the container is shut down. This behaviour is useful in order to make read-only + container directories writable while the container is running. For example, use the + <literal>--overlay=+/var::/var</literal> option in order to automatically overlay a writable temporary + directory on a read-only <filename>/var</filename> directory.</para> + <para>For details about overlay file systems, see <ulink url="https://www.kernel.org/doc/Documentation/filesystems/overlayfs.txt">overlayfs.txt</ulink>. Note that the semantics of overlay file systems are substantially diff --git a/man/systemd-resolve.xml b/man/systemd-resolve.xml index 2bc917ac26..bfd5a68fd9 100644 --- a/man/systemd-resolve.xml +++ b/man/systemd-resolve.xml @@ -120,7 +120,7 @@ originating from local, trusted sources is also reported authenticated, including resolution of the local host name, the <literal>localhost</literal> host name or all data from <filename>/etc/hosts</filename>.</para> - <para>The <option>--type=</option> switch may be used to specify a DNS resource record type (A, AAAA, SOA, MX, ...) in + <para>The <option>--type=</option> switch may be used to specify a DNS resource record type (A, AAAA, SOA, MX, …) in order to request a specific DNS resource record, instead of the address or reverse address lookups. The special value <literal>help</literal> may be used to list known values.</para> @@ -356,7 +356,7 @@ _xmpp-server._tcp/gmail.com: alt1.xmpp-server.l.google.com:5269 [priority=20, we 173.194.210.125 alt4.xmpp-server.l.google.com:5269 [priority=20, weight=0] 173.194.65.125 - ... + … </programlisting> </example> @@ -367,7 +367,7 @@ _xmpp-server._tcp/gmail.com: alt1.xmpp-server.l.google.com:5269 [priority=20, we d08ee310438ca124a6149ea5cc21b6313b390dce485576eff96f8722._openpgpkey.fedoraproject.org. IN OPENPGPKEY mQINBFBHPMsBEACeInGYJCb+7TurKfb6wGyTottCDtiSJB310i37/6ZYoeIay/5soJjlMyf MFQ9T2XNT/0LM6gTa0MpC1st9LnzYTMsT6tzRly1D1UbVI6xw0g0vE5y2Cjk3xUwAynCsSs - ... + … </programlisting> </example> diff --git a/man/systemd-socket-activate.xml b/man/systemd-socket-activate.xml index 1c0619a840..356bc10359 100644 --- a/man/systemd-socket-activate.xml +++ b/man/systemd-socket-activate.xml @@ -136,7 +136,7 @@ </varlistentry> <varlistentry> - <term><option>--fdname=</option><replaceable>NAME</replaceable><optional>:<replaceable>NAME</replaceable>...</optional></term> + <term><option>--fdname=</option><replaceable>NAME</replaceable><optional>:<replaceable>NAME</replaceable>…</optional></term> <listitem><para>Specify names for the file descriptors passed. This is equivalent to setting <varname>FileDescriptorName=</varname> in socket unit files, and enables use of diff --git a/man/systemd-socket-proxyd.xml b/man/systemd-socket-proxyd.xml index 804a8c38f1..74d9e1c124 100644 --- a/man/systemd-socket-proxyd.xml +++ b/man/systemd-socket-proxyd.xml @@ -127,10 +127,10 @@ PrivateNetwork=yes]]></programlisting> <example> <title>nginx.conf</title> <programlisting> -<![CDATA[[...] +<![CDATA[[…] server { listen unix:/tmp/nginx.sock; - [...]]]> + […]]]> </programlisting> </example> <example> @@ -169,10 +169,10 @@ PrivateNetwork=yes]]></programlisting> </example> <example> <title>nginx.conf</title> - <programlisting><![CDATA[[...] + <programlisting><![CDATA[[…] server { listen 8080; - [...]]]></programlisting> + […]]]></programlisting> </example> <example> <title>Enabling the proxy</title> diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index ab83876eba..f27e4a5c04 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -1806,23 +1806,32 @@ <title>Summary of possible service result variable values</title> <tgroup cols='3'> <colspec colname='result' /> - <colspec colname='status' /> <colspec colname='code' /> + <colspec colname='status' /> <thead> <row> <entry><varname>$SERVICE_RESULT</varname></entry> - <entry><varname>$EXIT_STATUS</varname></entry> <entry><varname>$EXIT_CODE</varname></entry> + <entry><varname>$EXIT_STATUS</varname></entry> </row> </thead> <tbody> <row> + <entry morerows="1" valign="top"><literal>protocol</literal></entry> + <entry valign="top">not set</entry> + <entry>not set</entry> + </row> + <row> + <entry><literal>exited</literal></entry> + <entry><literal>0</literal></entry> + </row> + + <row> <entry morerows="1" valign="top"><literal>timeout</literal></entry> <entry valign="top"><literal>killed</literal></entry> <entry><literal>TERM</literal>, <literal>KILL</literal></entry> </row> - <row> <entry valign="top"><literal>exited</literal></entry> <entry><literal>0</literal>, <literal>1</literal>, <literal>2</literal>, <literal diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index ffb66e735b..a549ec83bd 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -512,7 +512,9 @@ <varlistentry> <term><varname>ARPProxy=</varname></term> <listitem> - <para>A boolean. When true, enables ARP proxying.</para> + <para>A boolean. When true bridge-connected VXLAN tunnel endpoint + answers ARP requests from the local bridge on behalf of + remote Distributed Overlay Virtual Ethernet (DOVE) clients.</para> </listitem> </varlistentry> <varlistentry> diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 99283813fd..c7083a4fe6 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -123,7 +123,10 @@ <listitem> <para>A whitespace-separated list of shell-style globs matching the persistent path, as exposed by the udev - property <literal>ID_PATH</literal>.</para> + property <literal>ID_PATH</literal>. If the list is + prefixed with a "!", the test is inverted; i.e. it is + true when <literal>ID_PATH</literal> does not match any + item in the list.</para> </listitem> </varlistentry> <varlistentry> @@ -134,7 +137,8 @@ exposed by the udev property <literal>DRIVER</literal> of its parent device, or if that is not set the driver as exposed by <literal>ethtool -i</literal> of the - device itself.</para> + device itself. If the list is prefixed with a "!", the + test is inverted.</para> </listitem> </varlistentry> <varlistentry> @@ -142,7 +146,8 @@ <listitem> <para>A whitespace-separated list of shell-style globs matching the device type, as exposed by the udev property - <literal>DEVTYPE</literal>.</para> + <literal>DEVTYPE</literal>. If the list is prefixed with + a "!", the test is inverted.</para> </listitem> </varlistentry> <varlistentry> @@ -150,7 +155,8 @@ <listitem> <para>A whitespace-separated list of shell-style globs matching the device name, as exposed by the udev property - <literal>INTERFACE</literal>.</para> + <literal>INTERFACE</literal>. If the list is prefixed + with a "!", the test is inverted.</para> </listitem> </varlistentry> <varlistentry> @@ -232,6 +238,18 @@ the network otherwise.</para> </listitem> </varlistentry> + <varlistentry> + <term><varname>Unmanaged=</varname></term> + <listitem> + <para>A boolean. When <literal>yes</literal>, no attempts are + made to bring up or configure matching links, equivalent to + when there are no matching network files. Defaults to + <literal>no</literal>.</para> + <para>This is useful for preventing later matching network + files from interfering with certain interfaces that are fully + controlled by other applications.</para> + </listitem> + </varlistentry> </variablelist> </refsect1> @@ -596,47 +614,57 @@ <varlistentry> <term><varname>Bridge=</varname></term> <listitem> - <para>The name of the bridge to add the link to.</para> + <para>The name of the bridge to add the link to. See + <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>. + </para> </listitem> </varlistentry> <varlistentry> <term><varname>Bond=</varname></term> <listitem> - <para>The name of the bond to add the link to.</para> + <para>The name of the bond to add the link to. See + <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>. + </para> </listitem> </varlistentry> <varlistentry> <term><varname>VRF=</varname></term> <listitem> - <para>The name of the VRF to add the link to.</para> + <para>The name of the VRF to add the link to. See + <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>. + </para> </listitem> </varlistentry> <varlistentry> <term><varname>VLAN=</varname></term> <listitem> - <para>The name of a VLAN to create on the link. This - option may be specified more than once.</para> + <para>The name of a VLAN to create on the link. See + <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>. + This option may be specified more than once.</para> </listitem> </varlistentry> <varlistentry> <term><varname>MACVLAN=</varname></term> <listitem> - <para>The name of a MACVLAN to create on the link. This - option may be specified more than once.</para> + <para>The name of a MACVLAN to create on the link. See + <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>. + This option may be specified more than once.</para> </listitem> </varlistentry> <varlistentry> <term><varname>VXLAN=</varname></term> <listitem> - <para>The name of a VXLAN to create on the link. This - option may be specified more than once.</para> + <para>The name of a VXLAN to create on the link. See + <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>. + This option may be specified more than once.</para> </listitem> </varlistentry> <varlistentry> <term><varname>Tunnel=</varname></term> <listitem> - <para>The name of a Tunnel to create on the link. This - option may be specified more than once.</para> + <para>The name of a Tunnel to create on the link. See + <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>. + This option may be specified more than once.</para> </listitem> </varlistentry> </variablelist> @@ -1275,53 +1303,75 @@ </refsect1> <refsect1> - <title>Example</title> + <title>Examples</title> <example> - <title>/etc/systemd/network/50-static.network</title> + <title>Static network configuration</title> - <programlisting>[Match] + <programlisting># /etc/systemd/network/50-static.network +[Match] Name=enp2s0 [Network] Address=192.168.0.15/24 Gateway=192.168.0.1</programlisting> + + <para>This brings interface <literal>enp2s0</literal> up with a static address. The + specified gateway will be used for a default route.</para> </example> <example> - <title>/etc/systemd/network/80-dhcp.network</title> + <title>DHCP on ethernet links</title> - <programlisting>[Match] + <programlisting># /etc/systemd/network/80-dhcp.network +[Match] Name=en* [Network] DHCP=yes</programlisting> + + <para>This will enable DHCPv4 and DHCPv6 on all interfaces with names starting with + <literal>en</literal> (i.e. ethernet interfaces).</para> </example> <example> - <title>/etc/systemd/network/25-bridge-static.network</title> + <title>A bridge with two enslaved links</title> - <programlisting>[Match] + <programlisting># /etc/systemd/network/25-bridge-static.network +[Match] Name=bridge0 [Network] Address=192.168.0.15/24 Gateway=192.168.0.1 DNS=192.168.0.1</programlisting> - </example> - <example> - <title>/etc/systemd/network/25-bridge-slave-interface.network</title> - - <programlisting>[Match] + <programlisting># /etc/systemd/network/25-bridge-slave-interface-1.network +[Match] Name=enp2s0 [Network] Bridge=bridge0</programlisting> + + <programlisting># /etc/systemd/network/25-bridge-slave-interface-2.network +[Match] +Name=wlp3s0 + +[Network] +Bridge=bridge0</programlisting> + + <para>This creates a bridge and attaches devices <literal>enp2s0</literal> and + <literal>wlp3s0</literal> to it. The bridge will have the specified static address + and network assigned, and a default route via the specified gateway will be + added. The specified DNS server will be added to the global list of DNS resolvers. + </para> </example> + <example> - <title>/etc/systemd/network/25-bridge-slave-interface-vlan.network</title> + <title></title> - <programlisting>[Match] + <programlisting> +# /etc/systemd/network/20-bridge-slave-interface-vlan.network +[Match] Name=enp2s0 [Network] @@ -1337,66 +1387,106 @@ VLAN=100-200 [BridgeVLAN] EgressUntagged=300-400</programlisting> - </example> - <example> - <title>/etc/systemd/network/25-ipip.network</title> - <programlisting>[Match] -Name=em1 - -[Network] -Tunnel=ipip-tun</programlisting> + <para>This overrides the configuration specified in the previous example for the + interface <literal>enp2s0</literal>, and enables VLAN on that bridge port. VLAN IDs + 1-32, 42, 100-400 will be allowed. Packets tagged with VLAN IDs 42, 300-400 will be + untagged when they leave on this interface. Untagged packets which arrive on this + interface will be assigned VLAN ID 42.</para> </example> <example> - <title>/etc/systemd/network/25-sit.network</title> + <title>Various tunnels</title> - <programlisting>[Match] -Name=em1 + <programlisting>/etc/systemd/network/25-tunnels.network +[Match] +Name=ens1 [Network] -Tunnel=sit-tun</programlisting> +Tunnel=ipip-tun +Tunnel=sit-tun +Tunnel=gre-tun +Tunnel=vti-tun + </programlisting> + + <programlisting>/etc/systemd/network/25-tunnel-ipip.netdev +[NetDev] +Name=ipip-tun +Kind=ipip + </programlisting> + + <programlisting>/etc/systemd/network/25-tunnel-sit.netdev +[NetDev] +Name=sit-tun +Kind=sit + </programlisting> + + <programlisting>/etc/systemd/network/25-tunnel-gre.netdev +[NetDev] +Name=gre-tun +Kind=gre + </programlisting> + + <programlisting>/etc/systemd/network/25-tunnel-vti.netdev +[NetDev] +Name=vti-tun +Kind=vti + </programlisting> + + <para>This will bring interface <literal>ens1</literal> up and create an IPIP tunnel, + a SIT tunnel, a GRE tunnel, and a VTI tunnel using it.</para> </example> <example> - <title>/etc/systemd/network/25-gre.network</title> + <title>A bond device</title> - <programlisting>[Match] -Name=em1 + <programlisting># /etc/systemd/network/30-bond1.network +[Match] +Name=bond1 [Network] -Tunnel=gre-tun</programlisting> - </example> +DHCP=ipv6 +</programlisting> - <example> - <title>/etc/systemd/network/25-vti.network</title> + <programlisting># /etc/systemd/network/30-bond1.netdev +[NetDev] +Name=bond1 +Kind=bond +</programlisting> - <programlisting>[Match] -Name=em1 + <programlisting># /etc/systemd/network/30-bond1-dev1.nework +[Match] +MACAddress=52:54:00:e9:64:41 [Network] -Tunnel=vti-tun</programlisting> - </example> - - <example> - <title>/etc/systemd/network/25-bond.network</title> +Bond=bond1 +</programlisting> - <programlisting>[Match] -Name=bond1 + <programlisting># /etc/systemd/network/30-bond1-dev2.nework +[Match] +MACAddress=52:54:00:e9:64:42 [Network] -DHCP=yes +Bond=bond1 </programlisting> + + <para>This will create a bond device <literal>bond1</literal> and enslave the two + devices with MAC addresses 52:54:00:e9:64:41 and 52:54:00:e9:64:42 to it. IPv6 DHCP + will be used to acquire an address.</para> </example> <example> - <title>/etc/systemd/network/25-vrf.network</title> - <para>Add the bond1 interface to the VRF master interface vrf-test. This will redirect routes generated on this interface to be within the routing table defined during VRF creation. Traffic won't be redirected towards the VRFs routing table unless specific ip-rules are added.</para> - <programlisting>[Match] + <title>Virtual Routing and Forwarding (VRF)</title> + <para>Add the <literal>bond1</literal> interface to the VRF master interface + <literal>vrf1</literal>. This will redirect routes generated on this interface to be + within the routing table defined during VRF creation. Traffic won't be redirected + towards the VRFs routing table unless specific ip-rules are added.</para> + <programlisting># /etc/systemd/network/25-vrf.network +[Match] Name=bond1 [Network] -VRF=vrf-test +VRF=vrf1 </programlisting> </example> diff --git a/man/systemd.nspawn.xml b/man/systemd.nspawn.xml index b1344d6c10..7143188356 100644 --- a/man/systemd.nspawn.xml +++ b/man/systemd.nspawn.xml @@ -335,6 +335,17 @@ </varlistentry> <varlistentry> + <term><varname>Overlay=</varname></term> + <term><varname>OverlayReadOnly=</varname></term> + + <listitem><para>Adds an overlay mount point. Takes a colon-separated list of paths. This option may be used + multiple times to configure multiple overlay mounts. This option is equivalent to the command line switches + <option>--overlay=</option> and <option>--overlay-ro=</option>, see + <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry> for details + about the specific options supported. This setting is privileged (see above).</para></listitem> + </varlistentry> + + <varlistentry> <term><varname>PrivateUsersChown=</varname></term> <listitem><para>Configures whether the ownership of the files and directories in the container tree shall be diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 67c68d2f8b..684029bdb4 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -918,18 +918,14 @@ must be passed as separate words). Lone semicolons may be escaped as <literal>\;</literal>.</para> - <para>Each command line is split on whitespace, with the first - item being the command to execute, and the subsequent items being - the arguments. Double quotes ("...") and single quotes ('...') may - be used, in which case everything until the next matching quote - becomes part of the same argument. C-style escapes are also - supported. The table below contains the list of allowed escape - patterns. Only patterns which match the syntax in the table are - allowed; others will result in an error, and must be escaped by - doubling the backslash. Quotes themselves are removed after - parsing and escape sequences substituted. In addition, a trailing - backslash (<literal>\</literal>) may be used to merge lines. - </para> + <para>Each command line is split on whitespace, with the first item being the command to + execute, and the subsequent items being the arguments. Double quotes ("…") and single quotes + ('…') may be used, in which case everything until the next matching quote becomes part of the + same argument. Quotes themselves are removed. C-style escapes are also supported. The table + below contains the list of known escape patterns. Only escape patterns which match the syntax in + the table are allowed; other patterns may be added in the future and unknown patterns will + result in a warning. In particular, any backslashes should be doubled. Finally, a trailing + backslash (<literal>\</literal>) may be used to merge lines.</para> <para>This syntax is intended to be very similar to shell syntax, but only the meta-characters and expansions described in the diff --git a/man/systemd.special.xml b/man/systemd.special.xml index b513a13b5a..c2672511e3 100644 --- a/man/systemd.special.xml +++ b/man/systemd.special.xml @@ -930,7 +930,7 @@ Description=Render the desktop icons with Nautilus PartOf=graphical-session.target [Service] -... +… </programlisting> </example> </refsect2> diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 40c4cfd854..dbb0dc7bd7 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -1246,21 +1246,6 @@ <entry>This is either the unescaped instance name (if applicable) with <filename>/</filename> prepended (if applicable), or the unescaped prefix name prepended with <filename>/</filename>.</entry> </row> <row> - <entry><literal>%c</literal></entry> - <entry>Control group path of the unit</entry> - <entry>This path does not include the <filename>/sys/fs/cgroup/systemd/</filename> prefix.</entry> - </row> - <row> - <entry><literal>%r</literal></entry> - <entry>Control group path of the slice the unit is placed in</entry> - <entry>This usually maps to the parent control group path of <literal>%c</literal>.</entry> - </row> - <row> - <entry><literal>%R</literal></entry> - <entry>Root control group path below which slices and units are placed</entry> - <entry>For system instances, this resolves to <filename>/</filename>, except in containers, where this maps to the container's root control group path.</entry> - </row> - <row> <entry><literal>%t</literal></entry> <entry>Runtime directory</entry> <entry>This is either <filename>/run</filename> (for the system manager) or the path <literal>$XDG_RUNTIME_DIR</literal> resolves to (for user managers).</entry> @@ -1314,13 +1299,6 @@ </tgroup> </table> - <para>Please note that specifiers <literal>%U</literal>, - <literal>%h</literal>, <literal>%s</literal> are mostly useless - when systemd is running in system mode. PID 1 cannot query the - user account database for information, so the specifiers only work - as shortcuts for things which are already specified in a different - way in the unit file. They are fully functional when systemd is - running in <option>--user</option> mode.</para> </refsect1> <refsect1> diff --git a/man/systemd.xml b/man/systemd.xml index fb67ba7cb3..50398e6259 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -280,9 +280,9 @@ <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>, however some are created automatically from other configuration, dynamically from system state or programmatically at runtime. - Units may be "active" (meaning started, bound, plugged in, ..., + Units may be "active" (meaning started, bound, plugged in, …, depending on the unit type, see below), or "inactive" (meaning - stopped, unbound, unplugged, ...), as well as in the process of + stopped, unbound, unplugged, …), as well as in the process of being activated or deactivated, i.e. between the two states (these states are called "activating", "deactivating"). A special "failed" state is available as well, which is very similar to diff --git a/man/telinit.xml b/man/telinit.xml index 02d31fbd46..bdd22a6ce8 100644 --- a/man/telinit.xml +++ b/man/telinit.xml @@ -114,10 +114,10 @@ <listitem><para>Change the SysV runlevel. This is translated into an activation request for <filename>runlevel2.target</filename>, - <filename>runlevel3.target</filename>, ... and is equivalent + <filename>runlevel3.target</filename>, … and is equivalent to <command>systemctl isolate runlevel2.target</command>, <command>systemctl isolate runlevel3.target</command>, - ...</para></listitem> + …</para></listitem> </varlistentry> <varlistentry> diff --git a/man/timedatectl.xml b/man/timedatectl.xml index 415e2c799a..d8a83c8add 100644 --- a/man/timedatectl.xml +++ b/man/timedatectl.xml @@ -232,7 +232,7 @@ Password: ******** Status: "Using Time Server 216.239.38.15:123 (time4.google.com)." CGroup: /system.slice/systemd-timesyncd.service └─595 /usr/lib/systemd/systemd-timesyncd -...</programlisting> +…</programlisting> </para> </refsect1> |