net-util: add support for Type=ethernet

When DEVTYPE is not set for a nic, it means it is a wired/ethernet
device.

diff --git a/man/systemd-networkd.service.xml b/man/systemd-networkd.service.xml
index 908354c5875463c4fe39712ff1c30e4ffc99b6b1..f38e813e44e7cfc3db2a1c2e774a453769de2201 100644 (file)
--- a/man/systemd-networkd.service.xml
+++ b/man/systemd-networkd.service.xml
@@ -146,7 +146,8 @@
                                         <term><varname>Type</varname></term>
                                         <listitem>
                                                 <para>The device type, as exposed by the udev property
-                                                <literal>DEVTYPE</literal>.</para>
+                                                <literal>DEVTYPE</literal>, or <literal>ethernet</literal>
+                                                to match devices without a <literal>DEVTYPE</literal>.</para>
                                         </listitem>
                                 </varlistentry>
                                 <varlistentry>

diff --git a/man/udev.xml b/man/udev.xml
index 32a520e7b8c5b0be2ecb5c55bad0c39d2c4ac0c4..0bcb91139fbce7912a169b80d9512b66b3241c20 100644 (file)
--- a/man/udev.xml
+++ b/man/udev.xml
@@ -793,7 +793,8 @@
         <varlistentry>
           <term><varname>Type</varname></term>
           <listitem>
-            <para>The device type, as exposed by the udev property <literal>DEVTYPE</literal>.</para>
+            <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>
           </listitem>
         </varlistentry>
       </variablelist>

diff --git a/src/shared/net-util.c b/src/shared/net-util.c
index 8f8cfc9fdb6d7fe6ece6b9ede732c13a85ec4d95..85278e5de618d2efc9de816b07a4d571288783ab 100644 (file)
--- 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))
+        if (match_type && !streq_ptr(match_type, dev_type) && !(streq(match_type, "ethernet") && !dev_type))
                 return 0;
 
         if (match_name && !streq_ptr(match_name, dev_name))