From 9b1c2626cef16722603bded9bb52033aba34dd74 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Tue, 18 Feb 2014 22:06:49 +0100 Subject: net-match: fix Driver= match It should match on the driver of the parent device. --- src/network/networkd-network.c | 2 +- src/udev/net/link-config.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 48131c1f09..a470c22e3d 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -178,7 +178,7 @@ int network_get(Manager *manager, struct udev_device *device, Network **ret) { network->match_name, udev_device_get_sysattr_value(device, "address"), 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_sysname(device))) { log_debug("%s: found matching network '%s'", diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index bd97cd8cf8..3afaff10c8 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -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, udev_device_get_sysattr_value(device, "address"), 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), NULL)) { log_debug("Config file %s applies to device %s", -- cgit v1.2.3-54-g00ecf