summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-10-22 23:12:50 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-10-23 00:12:50 -0400
commit203af57fcdced5debfc26e1083eaefa031e322f4 (patch)
tree02010fe031e409c12258ede3340a9ba312958731 /man
parentb825ab1a99b69956057c79838faaf7b44afee474 (diff)
man: make udev.event-timeout more visible
Evidently some people had trouble finding it in the documentation.
Diffstat (limited to 'man')
-rw-r--r--man/kernel-command-line.xml2
-rw-r--r--man/systemd-udevd.service.xml9
-rw-r--r--man/udev.conf.xml35
3 files changed, 28 insertions, 18 deletions
diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index 2552c79c11..68460ac93d 100644
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -255,6 +255,8 @@
<term><varname>rd.udev.children-max=</varname></term>
<term><varname>udev.exec-delay=</varname></term>
<term><varname>rd.udev.exec-delay=</varname></term>
+ <term><varname>udev.event-timeout=</varname></term>
+ <term><varname>rd.udev.event-timeout=</varname></term>
<term><varname>net.ifnames=</varname></term>
<listitem>
diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
index 049a44074e..ab5c1636b2 100644
--- a/man/systemd-udevd.service.xml
+++ b/man/systemd-udevd.service.xml
@@ -58,10 +58,11 @@
<refentrytitle>udev</refentrytitle><manvolnum>7</manvolnum>
</citerefentry>.</para>
- <para>The behavior of the running daemon can be changed
- dynamically with <command>udevadm control</command>, or
- configured using
- <citerefentry><refentrytitle>udev.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+ <para>The behavior of the daemon can be configured using
+ <citerefentry><refentrytitle>udev.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ its command-line options, environment variables, and on the kernel
+ command-line, or changed dynamically with <command>udevadm
+ control</command>.
</para>
</refsect1>
diff --git a/man/udev.conf.xml b/man/udev.conf.xml
index de84b91258..16ad41e80e 100644
--- a/man/udev.conf.xml
+++ b/man/udev.conf.xml
@@ -61,20 +61,27 @@
<filename>/etc/udev/udev.conf</filename>. It consists of a set
of variables allowing the user to override default udev
values. All empty lines or lines beginning with '#' are
- ignored. The following variables can be set:</para>
-
- <variablelist>
- <varlistentry>
- <term><varname>udev_log</varname></term>
-
- <listitem>
- <para>The logging priority. Valid values are the numerical
- syslog priorities or their textual representations:
- <option>err</option>, <option>info</option> and
- <option>debug</option>.</para>
- </listitem>
- </varlistentry>
- </variablelist>
+ ignored. The following variables can be set:
+ </para>
+
+ <variablelist>
+ <varlistentry>
+ <term><varname>udev_log</varname></term>
+
+ <listitem>
+ <para>The logging priority. Valid values are the numerical
+ syslog priorities or their textual representations:
+ <option>err</option>, <option>info</option> and
+ <option>debug</option>.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <para>
+ In addition, <filename>systemd-udevd</filename> can be configured
+ by command-line options and the kernel commandline (see
+ <citerefentry><refentrytitle>systemd-udevd</refentrytitle><manvolnum>8</manvolnum></citerefentry>).
+ </para>
</refsect1>
<refsect1>