summaryrefslogtreecommitdiff
path: root/udev
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2010-03-10 15:00:00 +0100
committerKay Sievers <kay.sievers@vrfy.org>2010-03-10 15:00:00 +0100
commita00ff5db021b50864ba50cce15865bca2d52f91f (patch)
tree9a1c1378fe28f8393e745c9fd794ff3873cf8259 /udev
parentfbb31cd6e10fe66d2da781db0ba9a8d671a4c6aa (diff)
udevadm: monitor - use / as separator in --subsystem-match=subsystem[/devtype]
Diffstat (limited to 'udev')
-rw-r--r--udev/udevadm-monitor.c12
-rw-r--r--udev/udevadm.xml6
2 files changed, 12 insertions, 6 deletions
diff --git a/udev/udevadm-monitor.c b/udev/udevadm-monitor.c
index 4063c48303..d136c6070a 100644
--- a/udev/udevadm-monitor.c
+++ b/udev/udevadm-monitor.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2009 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2010 Kay Sievers <kay.sievers@vrfy.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -111,7 +111,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
char *devtype;
util_strscpy(subsys, sizeof(subsys), optarg);
- devtype = strchr(subsys, ':');
+ devtype = strchr(subsys, '/');
if (devtype != NULL) {
devtype[0] = '\0';
devtype++;
@@ -121,10 +121,10 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
}
case 'h':
printf("Usage: udevadm monitor [--property] [--kernel] [--udev] [--help]\n"
- " --property print the event properties\n"
- " --kernel print kernel uevents\n"
- " --udev print udev events\n"
- " --subsystem-match=<subsystem> filter events\n"
+ " --property print the event properties\n"
+ " --kernel print kernel uevents\n"
+ " --udev print udev events\n"
+ " --subsystem-match=<subsystem[/devtype]> filter events by subsystem\n"
" --help\n\n");
default:
goto out;
diff --git a/udev/udevadm.xml b/udev/udevadm.xml
index ad492494a1..fa1742bada 100644
--- a/udev/udevadm.xml
+++ b/udev/udevadm.xml
@@ -350,6 +350,12 @@
</listitem>
</varlistentry>
<varlistentry>
+ <term><option>--subsystem-match=<replaceable>string[/string]</replaceable></option></term>
+ <listitem>
+ <para>Filter events by subsystem[/devtype]. Only udev events with a matching subsystem value will pass.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term><option>--help</option></term>
<listitem>
<para>Print help text.</para>