diff options
| author | Tom Gundersen <teg@jklm.no> | 2014-01-04 04:22:06 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2014-01-04 15:21:58 +0100 |
| commit | d69b12ac8aed834e4a8220d19c6895ef04c73679 (patch) | |
| tree | 839275b173f419c148e8949bc7d50116ba3bad0e | |
| parent | 39602c3905da5196987b4df744541295ada725ae (diff) | |
Revert "net-util: add support for Type=ethernet"
This reverts commit 4cd1214db6cf4b262e8ce6381bc710091b375c96.
This may still be fixed in the kernel, revert this for now until
we see how it all shakes out.
| -rw-r--r-- | man/systemd-networkd.service.xml | 3 | ||||
| -rw-r--r-- | man/udev.xml | 3 | ||||
| -rw-r--r-- | src/shared/net-util.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/man/systemd-networkd.service.xml b/man/systemd-networkd.service.xml index f34471c395..57be3358fe 100644 --- a/man/systemd-networkd.service.xml +++ b/man/systemd-networkd.service.xml @@ -146,8 +146,7 @@ <term><varname>Type</varname></term> <listitem> <para>The device type, as exposed by the udev property - <literal>DEVTYPE</literal>, or <literal>ethernet</literal> - to match devices without a <literal>DEVTYPE</literal>.</para> + <literal>DEVTYPE</literal>.</para> </listitem> </varlistentry> <varlistentry> diff --git a/man/udev.xml b/man/udev.xml index 0bcb91139f..32a520e7b8 100644 --- a/man/udev.xml +++ b/man/udev.xml @@ -793,8 +793,7 @@ <varlistentry> <term><varname>Type</varname></term> <listitem> - <para>The device type, as exposed by the udev property <literal>DEVTYPE</literal>, or - <literal>ethernet</literal> to match a device without a <literal>DEVTYPE</literal>.</para> + <para>The device type, as exposed by the udev property <literal>DEVTYPE</literal>.</para> </listitem> </varlistentry> </variablelist> diff --git a/src/shared/net-util.c b/src/shared/net-util.c index 85278e5de6..8f8cfc9fdb 100644 --- a/src/shared/net-util.c +++ b/src/shared/net-util.c @@ -49,7 +49,7 @@ bool net_match_config(const struct ether_addr *match_mac, if (match_driver && !streq_ptr(match_driver, dev_driver)) return 0; - if (match_type && !streq_ptr(match_type, dev_type) && !(streq(match_type, "ethernet") && !dev_type)) + if (match_type && !streq_ptr(match_type, dev_type)) return 0; if (match_name && !streq_ptr(match_name, dev_name)) |