picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "net-util: add support for Type=ethernet"

Browse source 
This reverts commit 4cd1214db6.

This may still be fixed in the kernel, revert this for now until
we see how it all shakes out.
This commit is contained in:
Tom Gundersen 2014-01-04 04:22:06 +01:00
parent 39602c3905
commit d69b12ac8a
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
man/systemd-networkd.service.xml
View file

@ -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>

3
man/udev.xml
View file

@ -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>

2
src/shared/net-util.c
View file

@ -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))