picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

udevadm: trigger: support multiple arguments 

Closes #6098.
This commit is contained in:
Yu Watanabe 2019-01-18 17:09:18 +09:00
parent e022bf664c
commit 5b3b0733c9
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
man/udevadm.xml
View File

@ -189,7 +189,7 @@
</title>
<para>Request device events from the kernel. Primarily used to replay events at system coldplug time.</para>
<para>Takes a device specification as a positional argument. See the description of <command>info</command>
<para>Takes device specifications as positional arguments. See the description of <command>info</command>
above.</para>
<variablelist>
@ -298,7 +298,7 @@
<term><option>--name-match=<replaceable>NAME</replaceable></option></term>
<listitem>
<para>Trigger events for devices with a matching device path. When this option is specified more than once,
the last <replaceable>NAME</replaceable> is used.</para>
then each matching result is ORed, that is, all specified devices are triggered.</para>
</listitem>
</varlistentry>
<varlistentry>
@ -306,7 +306,7 @@
<term><option>--parent-match=<replaceable>SYSPATH</replaceable></option></term>
<listitem>
<para>Trigger events for all children of a given device. When this option is specified more than once,
the last <replaceable>NAME</replaceable> is used.</para>
then each matching result is ORed, that is, all children of each specified device are triggered.</para>
</listitem>
</varlistentry>
<varlistentry>
@ -332,8 +332,8 @@
<xi:include href="standard-options.xml" xpointer="help" />
</variablelist>
<para>In addition, an optional positional argument can be used
to specify device name or sys path. It must start with
<para>In addition, optional positional arguments can be used
to specify device names or sys paths. They must start with
<filename>/dev</filename> or <filename>/sys</filename>
respectively.</para>
</refsect2>

6
src/udev/udevadm-trigger.c
View File

@ -256,7 +256,7 @@ int trigger_main(int argc, char *argv[], void *userdata) {
if (r < 0)
return log_error_errno(r, "Failed to open the device '%s': %m", optarg);
r = sd_device_enumerator_add_match_parent(e, dev);
r = device_enumerator_add_match_parent_incremental(e, dev);
if (r < 0)
return log_error_errno(r, "Failed to add parent match '%s': %m", optarg);
break;
@ -272,7 +272,7 @@ int trigger_main(int argc, char *argv[], void *userdata) {
if (r < 0)
return log_error_errno(r, "Failed to open the device '%s': %m", optarg);
r = sd_device_enumerator_add_match_parent(e, dev);
r = device_enumerator_add_match_parent_incremental(e, dev);
if (r < 0)
return log_error_errno(r, "Failed to add parent match '%s': %m", optarg);
break;
@ -324,7 +324,7 @@ int trigger_main(int argc, char *argv[], void *userdata) {
if (r < 0)
return log_error_errno(r, "Failed to open the device '%s': %m", argv[optind]);
r = sd_device_enumerator_add_match_parent(e, dev);
r = device_enumerator_add_match_parent_incremental(e, dev);
if (r < 0)
return log_error_errno(r, "Failed to add parent match '%s': %m", argv[optind]);
}