X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fudev.xml;h=3dd2b489ff84531d9aefe9b739b9eaee251eeaa2;hp=9ea1cae4a3f81ba665a5dacaa76978251cbd980a;hb=4f50d2efbac87aba0505b9f998bf3e4bde64c214;hpb=bcddd5bf8033b0c9cb15a9d017b7714ebe21473a

diff --git a/man/udev.xml b/man/udev.xml
index 9ea1cae4a..3dd2b489f 100644
--- a/man/udev.xml
+++ b/man/udev.xml
@@ -255,7 +255,7 @@
             <para>Execute a program to determine whether there
             is a match; the key is true if the program returns
             successfully. The device properties are made available to the
-            executed program in the environment. The program's STDOUT
+            executed program in the environment. The program's standard ouput
             is available in the <varname>RESULT</varname> key.</para>
             <para>This can only be used for very short-running foreground tasks. For details,
             see <varname>RUN</varname>.</para>
@@ -799,13 +799,15 @@
         <varlistentry>
           <term><varname>Path</varname></term>
           <listitem>
-            <para>The persistent path, as exposed by the udev property <literal>ID_PATH</literal>.</para>
+            <para>The persistent path, as exposed by the udev property <literal>ID_PATH</literal>.
+            May contain shell style globs.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term><varname>Driver</varname></term>
           <listitem>
-            <para>The driver currently bound to the device, as exposed by the udev property <literal>DRIVER</literal>.</para>
+            <para>The driver currently bound to the device, as exposed by the
+            udev property <literal>DRIVER</literal> of its parent device.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
@@ -814,6 +816,35 @@
             <para>The device type, as exposed by the udev property <literal>DEVTYPE</literal>.</para>
           </listitem>
         </varlistentry>
+        <varlistentry>
+          <term><varname>Host</varname></term>
+          <listitem>
+            <para>Matches against the hostname or machine ID of the
+            host. See <literal>ConditionHost=</literal> in
+            <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+            for details.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><varname>Virtualization</varname></term>
+          <listitem>
+            <para>Checks whether the system is executed in a virtualized
+            environment and optionally test whether it is a specific
+            implementation. See <literal>ConditionVirtualization=</literal> in
+            <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+            for details.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><varname>KernelCommandLine</varname></term>
+          <listitem>
+            <para>Checks whether a specific kernel command line option is
+            set (or if prefixed with the exclamation mark unset). See
+            <literal>ConditionKernelCommandLine=</literal> in
+            <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+            for details.</para>
+          </listitem>
+        </varlistentry>
       </variablelist>
 
       <para>The <literal>[Link]</literal> section accepts the following keys:</para>
@@ -874,14 +905,23 @@
           <listitem>
             <para>An ordered, space-separated list of policies by which the
               interface name should be set. <literal>NamePolicy</literal> may
-              be disabeld by specifying <literal>net.ifnames=0</literal> on the
+              be disabled by specifying <literal>net.ifnames=0</literal> on the
               kernel commandline. Each of the policies may fail, and the first
-              successfull one is used. The name is not set directly, but
+              successful one is used. The name is not set directly, but
               is exported to udev as the property <literal>ID_NET_NAME</literal>,
               which is, by default, used by a udev rule to set
               <literal>NAME</literal>. The available policies are:
             </para>
             <variablelist>
+              <varlistentry>
+                <term><literal>database</literal></term>
+                <listitem>
+                  <para>The name is set based on entries in the Hardware
+                    Database with the key
+                    <literal>ID_NET_NAME_FROM_DATABASE</literal>.
+                  </para>
+                </listitem>
+              </varlistentry>
               <varlistentry>
                 <term><literal>onboard</literal></term>
                 <listitem>