X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevadm.xml;h=44e286bba64f8b05a6b86c9ec58e7118bc8a4e14;hb=f2291cd07f24d2e1b7c3295ea6570f64b935ba55;hp=9d905abd0c9d34806e0e91844dda2d2c38b24849;hpb=4b0faa2aa0e7ca87fc0fdb637c69e978a7241e1c;p=elogind.git

diff --git a/udev/udevadm.xml b/udev/udevadm.xml
index 9d905abd0..44e286bba 100644
--- a/udev/udevadm.xml
+++ b/udev/udevadm.xml
@@ -7,8 +7,7 @@
     <title>udevadm</title>
     <refentry>
       <refentryinfo>
-        <title>udevd</title>
-        <date>November 2007</date>
+        <title>udevadm</title>
         <productname>udev</productname>
       </refentryinfo>
 
@@ -90,7 +89,7 @@
                 <option>--path</option> or <option>--name</option> to identify the specified
                 device. Valid queries are:
                 <command>name</command>, <command>symlink</command>, <command>path</command>,
-                <command>env</command>, <command>all</command>.</para>
+                <command>property</command>, <command>all</command>.</para>
               </listitem>
             </varlistentry>
             <varlistentry>
@@ -150,7 +149,7 @@
         </refsect2>
 
         <refsect2><title>udevadm trigger <optional>options</optional></title>
-          <para>Request device events from the kernel. Usually used to replay events at system coldplug time.</para>
+          <para>Request device events from the kernel. Primarily used to replay events at system coldplug time.</para>
           <variablelist>
             <varlistentry>
               <term><option>--verbose</option></term>
@@ -175,7 +174,7 @@
             <varlistentry>
               <term><option>--action=<replaceable>action</replaceable></option></term>
               <listitem>
-                <para>Type of event to be triggered. The default value is <command>add</command>.</para>
+                <para>Type of event to be triggered. The default value is <command>change</command>.</para>
               </listitem>
             </varlistentry>
             <varlistentry>
@@ -210,6 +209,27 @@
                 of the sysfs attribute is checked. This option can be specified multiple times.</para>
               </listitem>
             </varlistentry>
+            <varlistentry>
+              <term><option>--property-match=<replaceable>property</replaceable>=<replaceable>value</replaceable></option></term>
+              <listitem>
+                <para>Trigger events for devices with a matching property value. This option can be
+                specified multiple times and supports shell style pattern matching.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>--tag-match=<replaceable>property</replaceable></option></term>
+              <listitem>
+                <para>Trigger events for devices with a matching tag. This option can be
+                specified multiple times.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>--sysname-match=<replaceable>name</replaceable></option></term>
+              <listitem>
+                <para>Trigger events for devices with a matching sys device name. This option can be
+                specified multiple times and supports shell style pattern matching.</para>
+              </listitem>
+            </varlistentry>
           </variablelist>
         </refsect2>
 
@@ -224,6 +244,24 @@
                 and always return immediately.</para>
               </listitem>
             </varlistentry>
+            <varlistentry>
+              <term><option>--seq-start=<replaceable>seqnum</replaceable></option></term>
+              <listitem>
+                <para>Wait only for events after the given sequence number.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>--seq-end=<replaceable>seqnum</replaceable></option></term>
+              <listitem>
+                <para>Wait only for events before the given sequence number.</para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><option>--exit-if-exists=<replaceable>file</replaceable></option></term>
+              <listitem>
+                <para>Stop waiting if file exists.</para>
+              </listitem>
+            </varlistentry>
             <varlistentry>
               <term><option>--quiet</option></term>
               <listitem>
@@ -266,13 +304,16 @@
             <varlistentry>
               <term><option>--reload-rules</option></term>
               <listitem>
-                <para>Signal udevd to reload the rules from the config.</para>
+                <para>Signal udevd to reload the rules files.
+                The udev daemon detects changes automatically, this option is
+                usually not needed. Reloading rules does not apply any changes
+                to already existing devices.</para>
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term><option>--env=<replaceable>KEY</replaceable>=<replaceable>value</replaceable></option></term>
+              <term><option>--property=<replaceable>KEY</replaceable>=<replaceable>value</replaceable></option></term>
               <listitem>
-                <para>Set global variable.</para>
+                <para>Set a global property for all events.</para>
               </listitem>
             </varlistentry>
             <varlistentry>
@@ -297,13 +338,6 @@
           event timing, by comparing the timestamps of the kernel uevent and the udev event.
           </para>
           <variablelist>
-            <varlistentry>
-              <term><option>--environment</option></term>
-              <listitem>
-                <para>Print the complete environment for all events. Can be used to compare the
-                kernel supplied and the udev added environment values.</para>
-              </listitem>
-            </varlistentry>
             <varlistentry>
               <term><option>--kernel</option></term>
               <listitem>
@@ -316,6 +350,24 @@
                 <para>Print the udev event after the rule processing.</para>
               </listitem>
             </varlistentry>
+            <varlistentry>
+              <term><option>--property</option></term>
+              <listitem>
+                <para>Also print the properties of the event.</para>
+              </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>--tag-match=<replaceable>string</replaceable></option></term>
+              <listitem>
+                <para>Filter events by property. Only udev events with a given tag attached will pass.</para>
+              </listitem>
+            </varlistentry>
             <varlistentry>
               <term><option>--help</option></term>
               <listitem>