From f8bdff40eb3060586a7a385e7879f519b9af7d51 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 8 Apr 2024 20:51:17 +0200 Subject: Merging upstream version 252.23. Signed-off-by: Daniel Baumann --- man/machine-id.xml | 3 +- man/org.freedesktop.portable1.xml | 7 +++- man/org.freedesktop.systemd1.xml | 8 +++- man/systemd-nspawn.xml | 3 +- man/systemd.exec.xml | 6 +-- man/systemd.service.xml | 79 ++++++++++++++------------------------- man/udev.xml | 15 ++++---- 7 files changed, 56 insertions(+), 65 deletions(-) (limited to 'man') 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 /var/lib/dbus/machine-id, the value of the kernel command line option container_uuid, the KVM DMI product_uuid or the devicetree vm,uuid - (on KVM systems), and finally a randomly generated UUID. + (on KVM systems), the Xen hypervisor uuid, and finally a randomly + generated UUID. After the machine ID is established, systemd1 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 { mkdir Note that an image cannot be attached if a unit that it contains is already present - on the system. + 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. AttachImageWithExtensions() attaches a portable image to the system. This method is a superset of AttachImage() with the addition of @@ -271,7 +272,9 @@ node /org/freedesktop/portable1 { unlink - Note that an image cannot be detached if a unit that it contains is running. + 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. DetachImageWithExtensions() detaches a portable image from the system. This method is a superset of DetachImage() 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 ignore-dependencies, it will start a unit but ignore all its dependencies. If ignore-requirements, 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. + 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 JobRemoved() signal, then calling + StartUnit() and using the returned job object to filter out unrelated + JobRemoved() signals, until the desired one is received, which will then carry + the result of the start operation. StartUnitReplace() is similar to StartUnit() but replaces a job that is queued for one unit by a job for another unit. 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 and the subdirectory is symlinked into the host at the same location. try-host and try-guest 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 mode. If auto (the default), and the right subdirectory of /var/log/journal 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 IgnoreSIGPIPE= - Takes a boolean argument. If true, causes SIGPIPE to be ignored in the - executed process. Defaults to true because SIGPIPE generally is useful only in shell - pipelines. + Takes a boolean argument. If true, SIGPIPE is ignored in the + executed process. Defaults to true since SIGPIPE is generally only useful in + shell pipelines. 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 @@ Restart= - 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 ExecStartPre=, - ExecStartPost=, - ExecStop=, - ExecStopPost=, or - ExecReload=. 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. - - Takes one of - , - , - , - , - , - , or - . - If set to (the default), the service will - not be restarted. If set to , it - will be restarted only when the service process exits cleanly. + 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 ExecStartPre=, + ExecStartPost=, ExecStop=, ExecStopPost=, + or ExecReload=. 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. + + Takes one of , , , + , , , or + . If set to (the default), the service will not be restarted. + If set to , it will be restarted only when the service process exits cleanly. In this context, a clean exit means any of the following: exit code of 0; - for types other than - Type=oneshot, one of the signals - SIGHUP, - SIGINT, - SIGTERM, or - SIGPIPE; + for types other than Type=oneshot, one of the signals + SIGHUP, SIGINT, + SIGTERM, or SIGPIPE; + exit statuses and signals specified in SuccessExitStatus=. - If set to - , 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 , - 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 - , 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 - , the service will be restarted - only if the watchdog timeout for the service expires. If set - to , the service will be restarted - regardless of whether it exited cleanly or not, got terminated - abnormally by a signal, or hit a timeout. + If set to , 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 , 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 , + 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 , the service will be restarted + only if the watchdog timeout for the service expires. If set to , 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 Type=oneshot services will never be restarted + on a clean exit status, i.e. and are rejected + for them. Exit causes and the effect of the <varname>Restart=</varname> settings 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" - The NAME, SYMLINK, - PROGRAM, OWNER, - GROUP, MODE, SECLABEL, - and RUN fields support simple string substitutions. + The ENV, GROUP, + MODE, NAME, + OWNER, PROGRAM, + RUN, SECLABEL, and + SYMLINK fields support simple string substitutions. The RUN 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: + 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: , -- cgit v1.2.3