X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm.xml;h=b5fb971f3bdb9dea2b6873df73b87798041c9f22;hp=00f299fb73827862770a97ed747680fa438d855c;hb=829f6902fe09d2eb1cff459fa5e26ed53f98ebc8;hpb=4281da1fa6fda10c15bee984825fc607a8385004

diff --git a/udev/udevadm.xml b/udev/udevadm.xml
index 00f299fb7..b5fb971f3 100644
--- a/udev/udevadm.xml
+++ b/udev/udevadm.xml
@@ -110,6 +110,12 @@
             query returns the absolute path including the root directory.</para>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term><option>--run</option></term>
+          <listitem>
+            <para>The udev runtime directory: <filename>/run/udev</filename>.</para>
+          </listitem>
+        </varlistentry>
         <varlistentry>
           <term><option>--attribute-walk</option></term>
           <listitem>
@@ -144,12 +150,9 @@
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term><option>--convert-db</option></term>
+          <term><option>--cleanup-db</option></term>
           <listitem>
-            <para>Convert the database of an earlier udev version to the current format. This
-            is only useful on udev version upgrades, where the content of the old database might
-            be needed for the running system, and it is not sufficient for it, to be re-created
-            with the next bootup.</para>
+            <para>Cleanup the udev database.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
@@ -186,7 +189,7 @@
           <term><option>--type=<replaceable>type</replaceable></option></term>
           <listitem>
             <para>Trigger a specific type of devices. Valid types are:
-            <command>devices</command>, <command>subsystems</command>, <command>failed</command>.
+            <command>devices</command>, <command>subsystems</command>.
             The default value is <command>devices</command>.</para>
           </listitem>
         </varlistentry>
@@ -259,7 +262,7 @@
           <term><option>--timeout=<replaceable>seconds</replaceable></option></term>
           <listitem>
             <para>Maximum number of seconds to wait for the event queue to become empty.
-            The default value is 180 seconds. A value of 0 will check if the queue is empty
+            The default value is 120 seconds. A value of 0 will check if the queue is empty
             and always return immediately.</para>
           </listitem>
         </varlistentry>
@@ -299,6 +302,12 @@
     <refsect2><title>udevadm control <replaceable>command</replaceable></title>
       <para>Modify the internal state of the running udev daemon.</para>
       <variablelist>
+        <varlistentry>
+          <term><option>--exit</option></term>
+          <listitem>
+            <para>Signal and wait for udevd to exit.</para>
+          </listitem>
+        </varlistentry>
         <varlistentry>
           <term><option>--log-priority=<replaceable>value</replaceable></option></term>
           <listitem>
@@ -342,6 +351,12 @@
             same time.</para>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term><option>--timeout=</option><replaceable>seconds</replaceable></term>
+          <listitem>
+            <para>The maximum number seonds to wait for a reply from udevd.</para>
+          </listitem>
+        </varlistentry>
         <varlistentry>
           <term><option>--help</option></term>
           <listitem>