shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-11-01 00:51:08 +03:00
Code

udevadm: control - fix --env key to accept --env=<KEY>=<value>

Browse Source
This commit is contained in:
Kay Sievers 2008-04-22 03:19:21 +02:00
parent 7b2aad3343
commit d8a9d01704
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extras/volume_id/vol_id.8
View File

@ -1,6 +1,6 @@
.\" Title: vol_id .\" Title: vol_id
.\" Author: .\" Author:
.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
.\" Date: March 2006 .\" Date: March 2006
.\" Manual: vol_id .\" Manual: vol_id
.\" Source: volume_id .\" Source: volume_id

10
udevadm.8
View File

@ -129,12 +129,12 @@ Trigger events for devices which belong to a matching subsystem\. This option ca
Do not trigger events for devices which belong to a matching subsystem\. This option can be specified multiple times and supports shell style pattern matching\. Do not trigger events for devices which belong to a matching subsystem\. This option can be specified multiple times and supports shell style pattern matching\.
.RE .RE
.PP .PP
\fB\-\-attr\-match=\fR\fB\fIattribute=value\fR\fR \fB\-\-attr\-match=\fR\fB\fIattribute\fR\fR\fB=\fR\fB\fIvalue\fR\fR
.RS 4 .RS 4
Trigger events for devices with a matching sysfs attribute\. If a value is specified along with the attribute name, the content of the attribute is matched against the given value using shell style pattern matching\. If no value is specified, the existence of the sysfs attribute is checked\. This option can be specified multiple times\. Trigger events for devices with a matching sysfs attribute\. If a value is specified along with the attribute name, the content of the attribute is matched against the given value using shell style pattern matching\. If no value is specified, the existence of the sysfs attribute is checked\. This option can be specified multiple times\.
.RE .RE
.PP .PP
\fB\-\-attr\-nomatch=\fR\fB\fIattribute=value\fR\fR \fB\-\-attr\-nomatch=\fR\fB\fIattribute\fR\fR\fB=\fR\fB\fIvalue\fR\fR
.RS 4 .RS 4
Do not trigger events for devices with a matching sysfs attribute\. If a value is specified along with the attribute name, the content of the attribute is matched against the given value using shell style pattern matching\. If no value is specified, the existence of the sysfs attribute is checked\. This option can be specified multiple times\. Do not trigger events for devices with a matching sysfs attribute\. If a value is specified along with the attribute name, the content of the attribute is matched against the given value using shell style pattern matching\. If no value is specified, the existence of the sysfs attribute is checked\. This option can be specified multiple times\.
.RE .RE
@ -191,17 +191,17 @@ Signal udevd to enable the execution of events\.
Signal udevd to reload the rules from the config\. Signal udevd to reload the rules from the config\.
.RE .RE
.PP .PP
\fB\-\-env \fR\fB\fIvar\fR\fR\fB=\fR\fB\fIvalue\fR\fR \fB\-\-env=\fR\fB\fIKEY\fR\fR\fB=\fR\fB\fIvalue\fR\fR
.RS 4 .RS 4
Set global variable\. Set global variable\.
.RE .RE
.PP .PP
\fB\-\-max_childs\fR \fB\-\-max_childs=\fR\fIvalue\fR
.RS 4 .RS 4
Set the maximum number of events, udevd will handle at the same time\. Set the maximum number of events, udevd will handle at the same time\.
.RE .RE
.PP .PP
\fB\-\-max_childs_running\fR \fB\-\-max_childs_running=\fR\fB\fIvalue\fR\fR
.RS 4 .RS 4
Set the maximum number of events, which are allowed to run at the same time\. Set the maximum number of events, which are allowed to run at the same time\.
.RE .RE

10
udevadm.xml
View File

@ -171,7 +171,7 @@
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>--attr-match=<replaceable>attribute=value</replaceable></option></term> <term><option>--attr-match=<replaceable>attribute</replaceable>=<replaceable>value</replaceable></option></term>
<listitem> <listitem>
<para>Trigger events for devices with a matching sysfs attribute. If a value is specified <para>Trigger events for devices with a matching sysfs attribute. If a value is specified
along with the attribute name, the content of the attribute is matched against the given along with the attribute name, the content of the attribute is matched against the given
@ -180,7 +180,7 @@
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>--attr-nomatch=<replaceable>attribute=value</replaceable></option></term> <term><option>--attr-nomatch=<replaceable>attribute</replaceable>=<replaceable>value</replaceable></option></term>
<listitem> <listitem>
<para>Do not trigger events for devices with a matching sysfs attribute. If a value is <para>Do not trigger events for devices with a matching sysfs attribute. If a value is
specified along with the attribute name, the content of the attribute is matched against specified along with the attribute name, the content of the attribute is matched against
@ -258,20 +258,20 @@
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>--env <replaceable>var</replaceable>=<replaceable>value</replaceable></option></term> <term><option>--env=<replaceable>KEY</replaceable>=<replaceable>value</replaceable></option></term>
<listitem> <listitem>
<para>Set global variable.</para> <para>Set global variable.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>--max_childs</option></term> <term><option>--max_childs=</option><replaceable>value</replaceable></term>
<listitem> <listitem>
<para>Set the maximum number of events, udevd will handle at the <para>Set the maximum number of events, udevd will handle at the
same time.</para> same time.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>--max_childs_running</option></term> <term><option>--max_childs_running=<replaceable>value</replaceable></option></term>
<listitem> <listitem>
<para>Set the maximum number of events, which are allowed to run at the <para>Set the maximum number of events, which are allowed to run at the
same time.</para> same time.</para>

5
udevcontrol.c
View File

@ -105,6 +105,9 @@ int udevcontrol(int argc, char *argv[], char *envp[])
*intval = count; *intval = count;
info("send max_childs_running=%i\n", *intval); info("send max_childs_running=%i\n", *intval);
} else if (!strncmp(arg, "env", strlen("env"))) { } else if (!strncmp(arg, "env", strlen("env"))) {
if (!strncmp(arg, "env=", strlen("env=")))
val = &arg[strlen("env=")];
else
val = argv[2]; val = argv[2];
if (val == NULL) { if (val == NULL) {
fprintf(stderr, "missing key\n"); fprintf(stderr, "missing key\n");
@ -119,7 +122,7 @@ int udevcontrol(int argc, char *argv[], char *envp[])
" --stop_exec_queue keep udevd from executing events, queue only\n" " --stop_exec_queue keep udevd from executing events, queue only\n"
" --start_exec_queue execute events, flush queue\n" " --start_exec_queue execute events, flush queue\n"
" --reload_rules reloads the rules files\n" " --reload_rules reloads the rules files\n"
" --env <var>=<value> set a global environment variable\n" " --env=<KEY>=<value> set a global environment variable\n"
" --max_childs=<N> maximum number of childs\n" " --max_childs=<N> maximum number of childs\n"
" --max_childs_running=<N> maximum number of childs running at the same time\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");