diff options
| author | Lennart Poettering <lennart@poettering.net> | 2022-08-08 15:32:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-08 15:32:55 +0200 |
| commit | d096265708faf028a389658e9415c40d0cbb1608 (patch) | |
| tree | ed8f770cabf8f6225f6ab00bc67af2d50e76b3e3 /man | |
| parent | 5ded3917a161d87984d74d70b5eb2a254e54b44e (diff) | |
| parent | 141332ab55203adddadbf59ff7792a7e3438092c (diff) | |
| download | systemd-d096265708faf028a389658e9415c40d0cbb1608.tar.gz | |
Merge pull request #24044 from dtardon/default-device-timeout
Add a configuration option for setting default device timeout
Diffstat (limited to 'man')
| -rw-r--r-- | man/org.freedesktop.systemd1.xml | 6 | ||||
| -rw-r--r-- | man/systemd-system.conf.xml | 11 |
2 files changed, 17 insertions, 0 deletions
diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml index f821d6562a..120ffbc8ef 100644 --- a/man/org.freedesktop.systemd1.xml +++ b/man/org.freedesktop.systemd1.xml @@ -426,6 +426,8 @@ node /org/freedesktop/systemd1 { @org.freedesktop.DBus.Property.EmitsChangedSignal("false") readonly t DefaultTimeoutAbortUSec = ...; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly t DefaultDeviceTimeoutUSec = ...; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly t DefaultRestartUSec = ...; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly t DefaultStartLimitIntervalUSec = ...; @@ -674,6 +676,8 @@ node /org/freedesktop/systemd1 { <!--property DefaultTimeoutAbortUSec is not documented!--> + <!--property DefaultDeviceTimeoutUSec is not documented!--> + <!--property DefaultRestartUSec is not documented!--> <!--property DefaultStartLimitIntervalUSec is not documented!--> @@ -1082,6 +1086,8 @@ node /org/freedesktop/systemd1 { <variablelist class="dbus-property" generated="True" extra-ref="DefaultTimeoutAbortUSec"/> + <variablelist class="dbus-property" generated="True" extra-ref="DefaultDeviceTimeoutUSec"/> + <variablelist class="dbus-property" generated="True" extra-ref="DefaultRestartUSec"/> <variablelist class="dbus-property" generated="True" extra-ref="DefaultStartLimitIntervalUSec"/> diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index ef311f1971..065bbd5a64 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -371,6 +371,17 @@ </varlistentry> <varlistentry> + <term><varname>DefaultDeviceTimeoutSec=</varname></term> + + <listitem><para>Configures the default timeout for waiting for devices. It can be changed per + device via the <varname>x-systemd.device-timeout=</varname> option in <filename>/etc/fstab</filename> + and <filename>/etc/crypttab</filename> (see + <citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry>, + <citerefentry><refentrytitle>crypttab</refentrytitle><manvolnum>5</manvolnum></citerefentry>). + Defaults to 90s.</para></listitem> + </varlistentry> + + <varlistentry> <term><varname>DefaultStartLimitIntervalSec=</varname></term> <term><varname>DefaultStartLimitBurst=</varname></term> |