summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2015-02-10 18:30:16 +0100
committerTom Gundersen <teg@jklm.no>2015-02-10 22:30:35 +0100
commit5256e00e8b9015dd1a976d647fc71dc7efbd8cf8 (patch)
tree371a378a004c556cc4d59122dea969a4148d843c /man
parentea6ec096db5f9f3562b9bbf438da7fe21411c74d (diff)
net: support globbing and disjunction in Match logic
Match{Name,OrginalName,Type,Driver,Path} can now take a space-separated glob of matches.
Diffstat (limited to 'man')
-rw-r--r--man/systemd.link.xml20
-rw-r--r--man/systemd.network.xml18
2 files changed, 21 insertions, 17 deletions
diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index afc0ad8c5e..d0e9f8e507 100644
--- a/man/systemd.link.xml
+++ b/man/systemd.link.xml
@@ -103,10 +103,10 @@
<varlistentry>
<term><varname>OriginalName=</varname></term>
<listitem>
- <para>The device name, as exposed by the udev property
- "INTERFACE". May contain shell style globs. This can not be
- used to match on names that have already been changed from
- userspace. Caution is advised when matching on
+ <para>A whitespace-separated list of shell-style globs matching
+ the device name, as exposed by the udev property
+ "INTERFACE". This can not be used to match on names that have
+ already been changed from userspace. Caution is advised when matching on
kernel-assigned names, as they are known to be unstable
between reboots.</para>
</listitem>
@@ -114,15 +114,16 @@
<varlistentry>
<term><varname>Path=</varname></term>
<listitem>
- <para>The persistent path, as exposed by the
- udev property <literal>ID_PATH</literal>. May
- contain shell style globs.</para>
+ <para>A whitespace-separated list of shell-style globs matching
+ the persistent path, as exposed by the udev property
+ <literal>ID_PATH</literal>.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>Driver=</varname></term>
<listitem>
- <para>The driver currently bound to the device,
+ <para>A whitespace-separated list of shell-style globs matching
+ the driver currently bound to the device,
as exposed by the udev property <literal>DRIVER</literal>
of its parent device, or if that is not set, the
driver as exposed by <literal>ethtool -i</literal>
@@ -132,7 +133,8 @@
<varlistentry>
<term><varname>Type=</varname></term>
<listitem>
- <para>The device type, as exposed by the udev
+ <para>A whitespace-separated list of shell-style globs matching
+ the device type, as exposed by the udev
property <literal>DEVTYPE</literal>.</para>
</listitem>
</varlistentry>
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 9b3a92d266..069b605eda 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -107,15 +107,16 @@
<varlistentry>
<term><varname>Path=</varname></term>
<listitem>
- <para>The persistent path, as exposed by the udev
- property <literal>ID_PATH</literal>. May contain shell
- style globs.</para>
+ <para>A whitespace-separated list of shell-style globs
+ matching the persistent path, as exposed by the udev
+ property <literal>ID_PATH</literal>.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>Driver=</varname></term>
<listitem>
- <para>The driver currently bound to the device, as
+ <para>A whitespace-separated list of shell-style globs
+ matching the driver currently bound to the device, as
exposed by the udev property <literal>DRIVER</literal>
of its parent device, or if that is not set the driver
as exposed by <literal>ethtool -i</literal> of the
@@ -125,16 +126,17 @@
<varlistentry>
<term><varname>Type=</varname></term>
<listitem>
- <para>The device type, as exposed by the udev property
+ <para>A whitespace-separated list of shell-style globs
+ matching the device type, as exposed by the udev property
<literal>DEVTYPE</literal>.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>Name=</varname></term>
<listitem>
- <para>The device name, as exposed by the udev property
- <literal>INTERFACE</literal>. May contain shell style
- globs.</para>
+ <para>A whitespace-separated list of shell-style globs
+ matching the device name, as exposed by the udev property
+ <literal>INTERFACE</literal>.</para>
</listitem>
</varlistentry>
<varlistentry>