udev-event.c: rename interface to <src>-<dest>, if <dest> taken

[elogind.git] / udev / udev.xml

diff --git a/udev/udev.xml b/udev/udev.xml
index adf531b372e6146c9fb07353911084c6e55fdece..20c394c28b75fd13313a5dce3c2f292277e706fd 100644 (file)
--- a/udev/udev.xml
+++ b/udev/udev.xml
@@ -437,6 +437,13 @@
                   by an earlier event.</para>
                 </listitem>
               </varlistentry>
+              <varlistentry>
+                <term><option>cmdline</option></term>
+                <listitem>
+                  <para>Import a single property from the kernel commandline. For simple flags
+                  the value of the property will be set to '1'.</para>
+                </listitem>
+              </varlistentry>
               <varlistentry>
                 <term><option>parent</option></term>
                 <listitem>
@@ -489,6 +496,16 @@
                   with this option.</para>
                 </listitem>
               </varlistentry>
+              <varlistentry>
+                <term><option>static_node=</option></term>
+                <listitem>
+                  <para>Apply the permissions specified in this rule to a static device node with
+                  the specified name. Static device nodes might be provided by kernel modules,
+                  or copied from <filename>/lib/udev/devices</filename>. These nodes might not have
+                  a corresponding kernel device at the time udevd is started, and allow to trigger
+                  automatic kernel module on-demand loading.</para>
+                </listitem>
+              </varlistentry>
               <varlistentry>
                 <term><option>watch</option></term>
                 <listitem>
@@ -496,6 +513,12 @@
                   writing, a change uevent will be synthesised.</para>
                 </listitem>
               </varlistentry>
+              <varlistentry>
+                <term><option>nowatch</option></term>
+                <listitem>
+                  <para>Disable the watching of a device node with inotify.</para>
+                </listitem>
+              </varlistentry>
             </variablelist>
           </listitem>
         </varlistentry>