net-match: fix Driver= match
It should match on the driver of the parent device.
This commit is contained in:
parent
11a7f22939
commit
9b1c2626ce
1
TODO
1
TODO
|
@ -639,7 +639,6 @@ Features:
|
||||||
- Make sure ID_PATH is always exported and complete for
|
- Make sure ID_PATH is always exported and complete for
|
||||||
network devices where possible, so we can safely rely
|
network devices where possible, so we can safely rely
|
||||||
on Path= matching
|
on Path= matching
|
||||||
- Check if Driver= is broken, or just my driver (bcma)
|
|
||||||
|
|
||||||
* sd-rtnl:
|
* sd-rtnl:
|
||||||
- add support for exiting containers without reading them fully first
|
- add support for exiting containers without reading them fully first
|
||||||
|
|
|
@ -165,7 +165,8 @@
|
||||||
<term><varname>Driver</varname></term>
|
<term><varname>Driver</varname></term>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>The driver currently bound to the device, as
|
<para>The driver currently bound to the device, as
|
||||||
exposed by the udev property <literal>DRIVER</literal>.
|
exposed by the udev property <literal>DRIVER</literal>
|
||||||
|
of its parent device.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
|
@ -805,7 +805,8 @@
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><varname>Driver</varname></term>
|
<term><varname>Driver</varname></term>
|
||||||
<listitem>
|
<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>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
|
|
|
@ -178,7 +178,7 @@ int network_get(Manager *manager, struct udev_device *device, Network **ret) {
|
||||||
network->match_name,
|
network->match_name,
|
||||||
udev_device_get_sysattr_value(device, "address"),
|
udev_device_get_sysattr_value(device, "address"),
|
||||||
udev_device_get_property_value(device, "ID_PATH"),
|
udev_device_get_property_value(device, "ID_PATH"),
|
||||||
udev_device_get_driver(device),
|
udev_device_get_driver(udev_device_get_parent(device)),
|
||||||
udev_device_get_devtype(device),
|
udev_device_get_devtype(device),
|
||||||
udev_device_get_sysname(device))) {
|
udev_device_get_sysname(device))) {
|
||||||
log_debug("%s: found matching network '%s'",
|
log_debug("%s: found matching network '%s'",
|
||||||
|
|
|
@ -244,7 +244,7 @@ int link_config_get(link_config_ctx *ctx, struct udev_device *device, link_confi
|
||||||
link->match_driver, link->match_type, NULL,
|
link->match_driver, link->match_type, NULL,
|
||||||
udev_device_get_sysattr_value(device, "address"),
|
udev_device_get_sysattr_value(device, "address"),
|
||||||
udev_device_get_property_value(device, "ID_PATH"),
|
udev_device_get_property_value(device, "ID_PATH"),
|
||||||
udev_device_get_driver(device),
|
udev_device_get_driver(udev_device_get_parent(device)),
|
||||||
udev_device_get_devtype(device),
|
udev_device_get_devtype(device),
|
||||||
NULL)) {
|
NULL)) {
|
||||||
log_debug("Config file %s applies to device %s",
|
log_debug("Config file %s applies to device %s",
|
||||||
|
|
Loading…
Reference in a new issue