summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--udevcontrol.c2
-rw-r--r--udevd.826
-rw-r--r--udevd.xml38
-rw-r--r--udevinfo.87
-rw-r--r--udevinfo.c5
-rw-r--r--udevinfo.xml8
6 files changed, 74 insertions, 12 deletions
diff --git a/udevcontrol.c b/udevcontrol.c
index a983f22835..6ca90855c5 100644
--- a/udevcontrol.c
+++ b/udevcontrol.c
@@ -125,7 +125,7 @@ int main(int argc, char *argv[], char *envp[])
" reload_rules reloads the rules files\n"
" max_childs=<N> maximum number of childs\n"
" max_childs_running=<N> maximum number of childs running at the same time\n"
- " --help print this help text\n\n");
+ " help print this help text\n\n");
goto exit;
} else {
fprintf(stderr, "unrecognized command '%s'\n", arg);
diff --git a/udevd.8 b/udevd.8
index d21f1d754c..614e4f338f 100644
--- a/udevd.8
+++ b/udevd.8
@@ -49,7 +49,7 @@ Print usage.
.PP
\fBlog_priority=\fR\fB\fIvalue\fR\fR
.RS 4
-udevcontrol can dynamically set the log level of udevd. Valid values are the numerical syslog priorities or their textual representations:
+Set the internal log level of udevd. Valid values are the numerical syslog priorities or their textual representations:
\fBerr\fR,
\fBinfo\fR
and
@@ -58,12 +58,32 @@ and
.PP
\fBstop_exec_queue\fR
.RS 4
-udevcontrol stops the execution of events from udevd.
+Signal udevd to stop executing new events. Incoming events will be queued.
.RE
.PP
\fBstart_exec_queue\fR
.RS 4
-udevcontrol starts the execution of events from udevd.
+Signal udevd to enable the execution of events.
+.RE
+.PP
+\fBreload_rules\fR
+.RS 4
+Signal udevd to reload the rules from the config.
+.RE
+.PP
+\fBmax_childs\fR
+.RS 4
+Set the maximum number of events, udevd will handle at the same time.
+.RE
+.PP
+\fBmax_childs_running\fR
+.RS 4
+Set the maximum number of events, which are allowed to run at the same time.
+.RE
+.PP
+\fBhelp\fR
+.RS 4
+Print help text.
.RE
.SH "ENVIRONMENT"
.PP
diff --git a/udevd.xml b/udevd.xml
index 84182884b6..674fa4d755 100644
--- a/udevd.xml
+++ b/udevd.xml
@@ -80,22 +80,48 @@
<varlistentry>
<term><option>log_priority=<replaceable>value</replaceable></option></term>
<listitem>
- <para>udevcontrol can dynamically set the log level of udevd.
- Valid values are the numerical syslog priorities or their textual
- representations: <option>err</option>, <option>info</option>
- and <option>debug</option>.</para>
+ <para>Set the internal log level of udevd. Valid values are the numerical
+ syslog priorities or their textual representations: <option>err</option>,
+ <option>info</option> and <option>debug</option>.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>stop_exec_queue</option></term>
<listitem>
- <para>udevcontrol stops the execution of events from udevd.</para>
+ <para>Signal udevd to stop executing new events. Incoming events
+ will be queued.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>start_exec_queue</option></term>
<listitem>
- <para>udevcontrol starts the execution of events from udevd.</para>
+ <para>Signal udevd to enable the execution of events.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>reload_rules</option></term>
+ <listitem>
+ <para>Signal udevd to reload the rules from the config.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>max_childs</option></term>
+ <listitem>
+ <para>Set the maximum number of events, udevd will handle at the
+ same time.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>max_childs_running</option></term>
+ <listitem>
+ <para>Set the maximum number of events, which are allowed to run at the
+ same time. </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>help</option></term>
+ <listitem>
+ <para>Print help text.</para>
</listitem>
</varlistentry>
</variablelist>
diff --git a/udevinfo.8 b/udevinfo.8
index a6ab1bbf0b..337f2064e4 100644
--- a/udevinfo.8
+++ b/udevinfo.8
@@ -14,7 +14,7 @@
udevinfo \- query udev device information
.SH "SYNOPSIS"
.HP 9
-\fBudevinfo\fR [\fB\-\-query=\fR\fB\fIquery\-type\fR\fR] [\fB\-\-path=\fR\fB\fIdevpath\fR\fR] [\fB\-\-name=\fR\fB\fInode\fR\fR] [\fB\-\-root\fR] [\fB\-\-attribute\-walk\fR] [\fB\-\-export\-db\fR] [\fB\-\-help\fR]
+\fBudevinfo\fR [\fB\-\-query=\fR\fB\fIquery\-type\fR\fR] [\fB\-\-path=\fR\fB\fIdevpath\fR\fR] [\fB\-\-name=\fR\fB\fInode\fR\fR] [\fB\-\-root\fR] [\fB\-\-attribute\-walk\fR] [\fB\-\-export\-db\fR] [\fB\-\-version\fR] [\fB\-\-help\fR]
.SH "DESCRIPTION"
.PP
udevinfo queries the udev database for device information stored in the udev database. It can also query the properties of a device from its sysfs representation to help creating udev rules that match this device.
@@ -64,6 +64,11 @@ Print all sysfs properties of the specified device that can be used in udev rule
Export the content of the udev database.
.RE
.PP
+\fB\-\-version\fR
+.RS 4
+Print version.
+.RE
+.PP
\fB\-\-help\fR
.RS 4
Print help text.
diff --git a/udevinfo.c b/udevinfo.c
index ef4750dbf4..3f47add87c 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -190,7 +190,7 @@ int main(int argc, char *argv[], char *envp[])
{ "attribute-walk", 0, NULL, 'a' },
{ "export-db", 0, NULL, 'e' },
{ "root", 0, NULL, 'r' },
- { "version", 0, NULL, 'V' },
+ { "version", 0, NULL, 1 }, /* -V outputs braindead format */
{ "help", 0, NULL, 'h' },
{}
};
@@ -290,6 +290,9 @@ int main(int argc, char *argv[], char *envp[])
case 'e':
export_db(export_record);
goto exit;
+ case 1:
+ printf("%s\n", UDEV_VERSION);
+ goto exit;
case 'V':
printf("udevinfo, version %s\n", UDEV_VERSION);
goto exit;
diff --git a/udevinfo.xml b/udevinfo.xml
index 82de79f6d8..bb3571cc23 100644
--- a/udevinfo.xml
+++ b/udevinfo.xml
@@ -32,6 +32,7 @@
<arg><option>--root</option></arg>
<arg><option>--attribute-walk</option></arg>
<arg><option>--export-db</option></arg>
+ <arg><option>--version</option></arg>
<arg><option>--help</option></arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -91,6 +92,13 @@
</varlistentry>
<varlistentry>
+ <term><option>--version</option></term>
+ <listitem>
+ <para>Print version.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><option>--help</option></term>
<listitem>
<para>Print help text.</para>