diff options
Diffstat (limited to '')
| -rw-r--r-- | man/machine-id.xml | 3 | ||||
| -rw-r--r-- | man/org.freedesktop.portable1.xml | 7 | ||||
| -rw-r--r-- | man/org.freedesktop.systemd1.xml | 8 | ||||
| -rw-r--r-- | man/systemd-nspawn.xml | 3 | ||||
| -rw-r--r-- | man/systemd.exec.xml | 6 | ||||
| -rw-r--r-- | man/systemd.service.xml | 79 | ||||
| -rw-r--r-- | man/udev.xml | 15 |
7 files changed, 56 insertions, 65 deletions
diff --git a/man/machine-id.xml b/man/machine-id.xml index ec1ab64..e57a7c1 100644 --- a/man/machine-id.xml +++ b/man/machine-id.xml @@ -101,7 +101,8 @@ to use the D-Bus machine ID from <filename>/var/lib/dbus/machine-id</filename>, the value of the kernel command line option <varname>container_uuid</varname>, the KVM DMI <filename>product_uuid</filename> or the devicetree <filename>vm,uuid</filename> - (on KVM systems), and finally a randomly generated UUID.</para> + (on KVM systems), the Xen hypervisor <filename>uuid</filename>, and finally a randomly + generated UUID.</para> <para>After the machine ID is established, <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry> diff --git a/man/org.freedesktop.portable1.xml b/man/org.freedesktop.portable1.xml index 00db6f8..07da65c 100644 --- a/man/org.freedesktop.portable1.xml +++ b/man/org.freedesktop.portable1.xml @@ -249,7 +249,8 @@ node /org/freedesktop/portable1 { <listitem><para>mkdir</para></listitem> </itemizedlist> Note that an image cannot be attached if a unit that it contains is already present - on the system.</para> + on the system. Note that this method returns only after all the listed operations are completed, + and due to the I/O involved it might take some time.</para> <para><function>AttachImageWithExtensions()</function> attaches a portable image to the system. This method is a superset of <function>AttachImage()</function> with the addition of @@ -271,7 +272,9 @@ node /org/freedesktop/portable1 { <itemizedlist> <listitem><para>unlink</para></listitem> </itemizedlist> - Note that an image cannot be detached if a unit that it contains is running.</para> + Note that an image cannot be detached if a unit that it contains is running. Note that this method + returns only after all the listed operations are completed, and due to the I/O involved it might take + some time.</para> <para><function>DetachImageWithExtensions()</function> detaches a portable image from the system. This method is a superset of <function>DetachImage()</function> with the addition of diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml index 0332632..1e12e8f 100644 --- a/man/org.freedesktop.systemd1.xml +++ b/man/org.freedesktop.systemd1.xml @@ -1228,7 +1228,13 @@ node /org/freedesktop/systemd1 { and terminate all units that aren't dependencies of it. If <literal>ignore-dependencies</literal>, it will start a unit but ignore all its dependencies. If <literal>ignore-requirements</literal>, it will start a unit but only ignore the requirement dependencies. It is not recommended to make use of the - latter two options. On completion, this method returns the newly created job object.</para> + latter two options. On reply, if successful, this method returns the newly created job object + which has been enqueued for asynchronous activation. Callers that want to track the outcome of the + actual start operation need to monitor the result of this job. This can be achieved in a race-free + manner by first subscribing to the <function>JobRemoved()</function> signal, then calling + <function>StartUnit()</function> and using the returned job object to filter out unrelated + <function>JobRemoved()</function> signals, until the desired one is received, which will then carry + the result of the start operation.</para> <para><function>StartUnitReplace()</function> is similar to <function>StartUnit()</function> but replaces a job that is queued for one unit by a job for another unit.</para> diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index fc471c3..d916aec 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -1317,7 +1317,8 @@ After=sys-subsystem-net-devices-ens1.device</programlisting> and the subdirectory is symlinked into the host at the same location. <literal>try-host</literal> and <literal>try-guest</literal> do the same but do not fail if - the host does not have persistent journaling enabled. If + the host does not have persistent journaling enabled, or if + the container is in the <option>--ephemeral</option> mode. If <literal>auto</literal> (the default), and the right subdirectory of <filename>/var/log/journal</filename> exists, it will be bind mounted into the container. If the diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 6459b01..d3b64e9 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -1101,9 +1101,9 @@ CapabilityBoundingSet=~CAP_B CAP_C</programlisting> <varlistentry> <term><varname>IgnoreSIGPIPE=</varname></term> - <listitem><para>Takes a boolean argument. If true, causes <constant>SIGPIPE</constant> to be ignored in the - executed process. Defaults to true because <constant>SIGPIPE</constant> generally is useful only in shell - pipelines.</para></listitem> + <listitem><para>Takes a boolean argument. If true, <constant>SIGPIPE</constant> is ignored in the + executed process. Defaults to true since <constant>SIGPIPE</constant> is generally only useful in + shell pipelines.</para></listitem> </varlistentry> </variablelist> diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 40c3173..c5207d9 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -765,62 +765,41 @@ <varlistentry> <term><varname>Restart=</varname></term> - <listitem><para>Configures whether the service shall be - restarted when the service process exits, is killed, or a - timeout is reached. The service process may be the main - service process, but it may also be one of the processes - specified with <varname>ExecStartPre=</varname>, - <varname>ExecStartPost=</varname>, - <varname>ExecStop=</varname>, - <varname>ExecStopPost=</varname>, or - <varname>ExecReload=</varname>. When the death of the process - is a result of systemd operation (e.g. service stop or - restart), the service will not be restarted. Timeouts include - missing the watchdog "keep-alive ping" deadline and a service - start, reload, and stop operation timeouts.</para> - - <para>Takes one of - <option>no</option>, - <option>on-success</option>, - <option>on-failure</option>, - <option>on-abnormal</option>, - <option>on-watchdog</option>, - <option>on-abort</option>, or - <option>always</option>. - If set to <option>no</option> (the default), the service will - not be restarted. If set to <option>on-success</option>, it - will be restarted only when the service process exits cleanly. + <listitem><para>Configures whether the service shall be restarted when the service process exits, + is killed, or a timeout is reached. The service process may be the main service process, but it may + also be one of the processes specified with <varname>ExecStartPre=</varname>, + <varname>ExecStartPost=</varname>, <varname>ExecStop=</varname>, <varname>ExecStopPost=</varname>, + or <varname>ExecReload=</varname>. When the death of the process is a result of systemd operation + (e.g. service stop or restart), the service will not be restarted. Timeouts include missing the watchdog + "keep-alive ping" deadline and a service start, reload, and stop operation timeouts.</para> + + <para>Takes one of <option>no</option>, <option>on-success</option>, <option>on-failure</option>, + <option>on-abnormal</option>, <option>on-watchdog</option>, <option>on-abort</option>, or + <option>always</option>. If set to <option>no</option> (the default), the service will not be restarted. + If set to <option>on-success</option>, it will be restarted only when the service process exits cleanly. In this context, a clean exit means any of the following: <itemizedlist> <listitem><simpara>exit code of 0;</simpara></listitem> - <listitem><simpara>for types other than - <varname>Type=oneshot</varname>, one of the signals - <constant>SIGHUP</constant>, - <constant>SIGINT</constant>, - <constant>SIGTERM</constant>, or - <constant>SIGPIPE</constant>;</simpara></listitem> + <listitem><simpara>for types other than <varname>Type=oneshot</varname>, one of the signals + <constant>SIGHUP</constant>, <constant>SIGINT</constant>, + <constant>SIGTERM</constant>, or <constant>SIGPIPE</constant>; + </simpara></listitem> <listitem><simpara>exit statuses and signals specified in <varname>SuccessExitStatus=</varname>.</simpara></listitem> </itemizedlist> - If set to - <option>on-failure</option>, the service will be restarted - when the process exits with a non-zero exit code, is - terminated by a signal (including on core dump, but excluding - the aforementioned four signals), when an operation (such as - service reload) times out, and when the configured watchdog - timeout is triggered. If set to <option>on-abnormal</option>, - the service will be restarted when the process is terminated - by a signal (including on core dump, excluding the - aforementioned four signals), when an operation times out, or - when the watchdog timeout is triggered. If set to - <option>on-abort</option>, the service will be restarted only - if the service process exits due to an uncaught signal not - specified as a clean exit status. If set to - <option>on-watchdog</option>, the service will be restarted - only if the watchdog timeout for the service expires. If set - to <option>always</option>, the service will be restarted - regardless of whether it exited cleanly or not, got terminated - abnormally by a signal, or hit a timeout.</para> + If set to <option>on-failure</option>, the service will be restarted when the process exits with + a non-zero exit code, is terminated by a signal (including on core dump, but excluding the aforementioned + four signals), when an operation (such as service reload) times out, and when the configured watchdog + timeout is triggered. If set to <option>on-abnormal</option>, the service will be restarted when + the process is terminated by a signal (including on core dump, excluding the aforementioned four signals), + when an operation times out, or when the watchdog timeout is triggered. If set to <option>on-abort</option>, + the service will be restarted only if the service process exits due to an uncaught signal not specified + as a clean exit status. If set to <option>on-watchdog</option>, the service will be restarted + only if the watchdog timeout for the service expires. If set to <option>always</option>, the service + will be restarted regardless of whether it exited cleanly or not, got terminated abnormally by + a signal, or hit a timeout. Note that <varname>Type=oneshot</varname> services will never be restarted + on a clean exit status, i.e. <option>always</option> and <option>on-success</option> are rejected + for them.</para> <table> <title>Exit causes and the effect of the <varname>Restart=</varname> settings</title> diff --git a/man/udev.xml b/man/udev.xml index 332c7ac..266dd61 100644 --- a/man/udev.xml +++ b/man/udev.xml @@ -680,15 +680,16 @@ SUBSYSTEM=="net", OPTIONS="log_level=debug"</programlisting></para> </varlistentry> </variablelist> - <para>The <varname>NAME</varname>, <varname>SYMLINK</varname>, - <varname>PROGRAM</varname>, <varname>OWNER</varname>, - <varname>GROUP</varname>, <varname>MODE</varname>, <varname>SECLABEL</varname>, - and <varname>RUN</varname> fields support simple string substitutions. + <para>The <varname>ENV</varname>, <varname>GROUP</varname>, + <varname>MODE</varname>, <varname>NAME</varname>, + <varname>OWNER</varname>, <varname>PROGRAM</varname>, + <varname>RUN</varname>, <varname>SECLABEL</varname>, and + <varname>SYMLINK</varname> fields support simple string substitutions. The <varname>RUN</varname> substitutions are performed after all rules have been processed, right before the program is executed, allowing for - the use of device properties set by earlier matching rules. For all other - fields, substitutions are performed while the individual rule is being - processed. The available substitutions are:</para> + the use of device properties set by earlier matching rules. For all + other fields, substitutions are performed while the individual rule is + being processed. The available substitutions are:</para> <variablelist class='udev-directives'> <varlistentry> <term><option>$kernel</option>, <option>%k</option></term> |