summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--man/udev.72
-rw-r--r--man/udev.conf.54
-rw-r--r--man/udevadm.82
-rw-r--r--man/udevd.854
-rw-r--r--man/udevd.xml64
5 files changed, 75 insertions, 51 deletions
diff --git a/man/udev.7 b/man/udev.7
index 8b6e90208b..da634fa55d 100644
--- a/man/udev.7
+++ b/man/udev.7
@@ -2,7 +2,7 @@
.\" Title: udev
.\" Author: Greg Kroah-Hartmann <greg@kroah.com>
.\" Generator: DocBook XSL Stylesheets v1.78.0 <http://docbook.sf.net/>
-.\" Date: 10/31/2014
+.\" Date: 11/02/2014
.\" Manual: udev
.\" Source: udev
.\" Language: English
diff --git a/man/udev.conf.5 b/man/udev.conf.5
index 12a5992ebe..db0fcf492e 100644
--- a/man/udev.conf.5
+++ b/man/udev.conf.5
@@ -2,7 +2,7 @@
.\" Title: udev.conf
.\" Author: Kay Sievers <kay@vrfy.org>
.\" Generator: DocBook XSL Stylesheets v1.78.0 <http://docbook.sf.net/>
-.\" Date: 10/31/2014
+.\" Date: 11/02/2014
.\" Manual: udev.conf
.\" Source: eudev
.\" Language: English
@@ -41,7 +41,7 @@ expects its main configuration file at
.PP
\fIudev_log\fR
.RS 4
-The logging priority\&. Valid values are the numerical syslog priorities or their textual representations:
+The log level\&. Valid values are the numerical syslog priorities or their textual representations:
\fBerr\fR,
\fBinfo\fR
and
diff --git a/man/udevadm.8 b/man/udevadm.8
index 7ee8e55bf3..a9fe4411a7 100644
--- a/man/udevadm.8
+++ b/man/udevadm.8
@@ -2,7 +2,7 @@
.\" Title: udevadm
.\" Author: Kay Sievers <kay@vrfy.org>
.\" Generator: DocBook XSL Stylesheets v1.78.0 <http://docbook.sf.net/>
-.\" Date: 10/31/2014
+.\" Date: 11/02/2014
.\" Manual: udevadm
.\" Source: eudev
.\" Language: English
diff --git a/man/udevd.8 b/man/udevd.8
index c6251de4d1..69f003d7f6 100644
--- a/man/udevd.8
+++ b/man/udevd.8
@@ -2,12 +2,12 @@
.\" Title: udevd
.\" Author: Kay Sievers <kay@vrfy.org>
.\" Generator: DocBook XSL Stylesheets v1.78.0 <http://docbook.sf.net/>
-.\" Date: 10/31/2014
+.\" Date: 11/02/2014
.\" Manual: udevd
-.\" Source: udev
+.\" Source: eudev
.\" Language: English
.\"
-.TH "UDEVD" "8" "" "udev" "udevd"
+.TH "UDEVD" "8" "" "eudev" "udevd"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -33,16 +33,16 @@ udevd \- Device event managing daemon
.PP
udevd
.HP \w'\fB/sbin/udevd\fR\ 'u
-\fB/sbin/udevd\fR [\fB\-\-daemon\fR] [\fB\-\-debug\fR] [\fB\-\-children\-max=\fR] [\fB\-\-exec\-delay=\fR] [\fB\-\-resolve\-names=early|late|never\fR] [\fB\-\-version\fR] [\fB\-\-help\fR]
+\fB/sbin/udevd\fR [\fB\-\-daemon\fR] [\fB\-\-debug\fR] [\fB\-\-children\-max=\fR] [\fB\-\-exec\-delay=\fR] [\fB\-\-event\-timeout=\fR] [\fB\-\-resolve\-names=early|late|never\fR] [\fB\-\-version\fR] [\fB\-\-help\fR]
.SH "DESCRIPTION"
.PP
\fBudevd\fR
listens to kernel uevents\&. For every event, udevd executes matching instructions specified in udev rules\&. See
\fBudev\fR(7)\&.
.PP
-The behavior of the running daemon can be changed dynamically with
-\fBudevadm control\fR, or configured using
-\fBudev.conf\fR(5)\&.
+The behavior of the daemon can be configured using
+\fBudev.conf\fR(5), its command\-line options, environment variables, and on the kernel command\-line, or changed dynamically with
+\fBudevadm control\fR\&.
.SH "OPTIONS"
.PP
\fB\-\-daemon\fR
@@ -52,7 +52,7 @@ Detach and run in the background\&.
.PP
\fB\-\-debug\fR
.RS 4
-Print debug messages to stderr\&.
+Print debug messages to standard error\&.
.RE
.PP
\fB\-\-children\-max=\fR
@@ -62,34 +62,33 @@ Limit the number of events executed in parallel\&.
.PP
\fB\-\-exec\-delay=\fR
.RS 4
-Delay the execution of RUN instruction by the given number of seconds\&. This option might be useful when debugging system crashes during coldplug caused by loading non\-working kernel modules\&.
+Delay the execution of
+\fIRUN\fR
+instructions by the given number of seconds\&. This option might be useful when debugging system crashes during coldplug caused by loading non\-working kernel modules\&.
.RE
.PP
-\fB\-\-resolve\-names=\fR
+\fB\-\-event\-timeout=\fR
.RS 4
-Specify when udevd should resolve names of users and groups\&. When set to
-\fBearly\fR
-(the default) names will be resolved when the rules are parsed\&. When set to
-\fBlate\fR
-names will be resolved for every event\&. When set to
-\fBnever\fR
-names will never be resolved and all devices will be owned by root\&.
+Set the number of seconds to wait for events to finish\&. After this time the event will be terminated\&. The default is 30 seconds\&.
.RE
.PP
-\fB\-\-version\fR
+\fB\-\-resolve\-names=\fR
.RS 4
-Print version number\&.
+Specify when udevd should resolve names of users and groups\&. When set to
+\fBearly\fR
+(the default), names will be resolved when the rules are parsed\&. When set to
+\fBlate\fR, names will be resolved for every event\&. When set to
+\fBnever\fR, names will never be resolved and all devices will be owned by root\&.
.RE
.PP
\fB\-\-help\fR
.RS 4
-Print help text\&.
.RE
.SH "ENVIRONMENT"
.PP
\fI$UDEV_LOG=\fR
.RS 4
-Set the logging priority\&.
+Set the log level\&.
.RE
.SH "KERNEL COMMAND LINE"
.PP
@@ -99,7 +98,7 @@ is used in an initrd\&.
.PP
\fIudev\&.log\-priority=\fR, \fIrd\&.udev\&.log\-priority=\fR
.RS 4
-Set the logging priority\&.
+Set the log level\&.
.RE
.PP
\fIudev\&.children\-max=\fR, \fIrd\&.udev\&.children\-max=\fR
@@ -109,12 +108,19 @@ Limit the number of events executed in parallel\&.
.PP
\fIudev\&.exec\-delay=\fR, \fIrd\&.udev\&.exec\-delay=\fR
.RS 4
-Delay the execution of RUN instruction by the given number of seconds\&. This option might be useful when debugging system crashes during coldplug caused by loading non\-working kernel modules\&.
+Delay the execution of
+\fIRUN\fR
+instructions by the given number of seconds\&. This option might be useful when debugging system crashes during coldplug caused by loading non\-working kernel modules\&.
+.RE
+.PP
+\fIudev\&.event\-timeout=\fR, \fIrd\&.udev\&.event\-timeout=\fR
+.RS 4
+Wait for events to finish up to the given number of seconds\&. This option might be useful if events are terminated due to kernel drivers taking too long to initialize\&.
.RE
.PP
\fInet\&.ifnames=\fR
.RS 4
-Network interfaces are renamed to give them predictable names when possible\&. It is enabled by default, specifying 0 disables it\&.
+Network interfaces are renamed to give them predictable names when possible\&. It is enabled by default; specifying 0 disables it\&.
.RE
.SH "SEE ALSO"
.PP
diff --git a/man/udevd.xml b/man/udevd.xml
index de670cb578..cfbb798428 100644
--- a/man/udevd.xml
+++ b/man/udevd.xml
@@ -36,6 +36,7 @@
<arg><option>--debug</option></arg>
<arg><option>--children-max=</option></arg>
<arg><option>--exec-delay=</option></arg>
+ <arg><option>--event-timeout=</option></arg>
<arg><option>--resolve-names=early|late|never</option></arg>
<arg><option>--version</option></arg>
<arg><option>--help</option></arg>
@@ -50,10 +51,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>
@@ -65,50 +67,55 @@
<para>Detach and run in the background.</para>
</listitem>
</varlistentry>
+
<varlistentry>
<term><option>--debug</option></term>
<listitem>
- <para>Print debug messages to stderr.</para>
+ <para>Print debug messages to standard error.</para>
</listitem>
</varlistentry>
+
<varlistentry>
<term><option>--children-max=</option></term>
<listitem>
<para>Limit the number of events executed in parallel.</para>
</listitem>
</varlistentry>
+
<varlistentry>
<term><option>--exec-delay=</option></term>
<listitem>
+ <para>Delay the execution of <varname>RUN</varname>
+ instructions by the given number of seconds. This option
+ might be useful when debugging system crashes during
+ coldplug caused by loading non-working kernel
+ modules.</para>
+ </listitem>
+ </varlistentry>
- <para>Delay the execution of RUN instruction by the given
- number of seconds. This option might be useful when
- debugging system crashes during coldplug caused by loading
- non-working kernel modules.</para>
+ <varlistentry>
+ <term><option>--event-timeout=</option></term>
+ <listitem>
+ <para>Set the number of seconds to wait for events to finish. After
+ this time the event will be terminated. The default is 30 seconds.</para>
</listitem>
</varlistentry>
+
<varlistentry>
<term><option>--resolve-names=</option></term>
<listitem>
<para>Specify when udevd should resolve names of users and groups.
- When set to <option>early</option> (the default) names will be
+ When set to <option>early</option> (the default), names will be
resolved when the rules are parsed. When set to
- <option>late</option> names will be resolved for every event.
- When set to <option>never</option> names will never be resolved
+ <option>late</option>, names will be resolved for every event.
+ When set to <option>never</option>, names will never be resolved
and all devices will be owned by root.</para>
</listitem>
</varlistentry>
- <varlistentry>
- <term><option>--version</option></term>
- <listitem>
- <para>Print version number.</para>
- </listitem>
- </varlistentry>
+
<varlistentry>
<term><option>--help</option></term>
- <listitem>
- <para>Print help text.</para>
- </listitem>
+
</varlistentry>
</variablelist>
</refsect1>
@@ -146,20 +153,31 @@
<term><varname>udev.exec-delay=</varname></term>
<term><varname>rd.udev.exec-delay=</varname></term>
<listitem>
- <para>Delay the execution of RUN instruction by the given
+ <para>Delay the execution of <varname>RUN</varname> instructions by the given
number of seconds. This option might be useful when
debugging system crashes during coldplug caused by loading
non-working kernel modules.</para>
</listitem>
</varlistentry>
<varlistentry>
+ <term><varname>udev.event-timeout=</varname></term>
+ <term><varname>rd.udev.event-timeout=</varname></term>
+ <listitem>
+ <para>Wait for events to finish up to the given number
+ of seconds. This option might be useful if events are
+ terminated due to kernel drivers taking too long to initialize.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term><varname>net.ifnames=</varname></term>
<listitem>
<para>Network interfaces are renamed to give them predictable names
- when possible. It is enabled by default, specifying 0 disables it.</para>
+ when possible. It is enabled by default; specifying 0 disables it.</para>
</listitem>
</varlistentry>
</variablelist>
+ <!-- when adding entries here, consider also adding them
+ in kernel-command-line.xml -->
</refsect1>
<refsect1>