X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevadm.xml;h=e4151e0ed4e5f01813229edf9dfbf8a59aebc2ea;hb=cf5bd04073671df31dbbaf525f870366b37e5256;hp=ebc4aa150fa793501024bca6a993740c38ca8c77;hpb=b76ad2e537e8672ace442eb27439521c9b107b09;p=elogind.git

diff --git a/udev/udevadm.xml b/udev/udevadm.xml
index ebc4aa150..e4151e0ed 100644
--- a/udev/udevadm.xml
+++ b/udev/udevadm.xml
@@ -90,7 +90,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>
@@ -210,6 +210,20 @@
                 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>--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,10 +238,28 @@
                 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>
-                <para>Do not print any output, like the remaining queue entries when reachin the timeout.</para>
+                <para>Do not print any output, like the remaining queue entries when reaching the timeout.</para>
               </listitem>
             </varlistentry>
             <varlistentry>
@@ -266,13 +298,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 +332,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 +344,12 @@
                 <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>--help</option></term>
               <listitem>
@@ -326,8 +360,7 @@
         </refsect2>
 
         <refsect2><title>udevadm test <optional>options</optional> <replaceable>devpath</replaceable></title>
-          <para>Simulate a udev event run for the given device, and print out debug
-          output. Unless forced to, no device node or symlink will be created.</para>
+          <para>Simulate a udev event run for the given device, and print debug output.</para>
           <variablelist>
             <varlistentry>
               <term><option>--action=<replaceable>string</replaceable></option></term>
@@ -341,13 +374,6 @@
                 <para>The subsystem string.</para>
               </listitem>
             </varlistentry>
-            <varlistentry>
-              <term><option>--force</option></term>
-              <listitem>
-                <para>Force the creation of a device node or symlink. Usually the test run
-                prints only debug output.</para>
-              </listitem>
-            </varlistentry>
             <varlistentry>
               <term><option>--help</option></term>
               <listitem>