diff options
author | Tom Gundersen <teg@jklm.no> | 2014-02-18 22:06:49 +0100 |
---|---|---|
committer | Tom Gundersen <teg@jklm.no> | 2014-02-18 22:34:26 +0100 |
commit | 9b1c2626cef16722603bded9bb52033aba34dd74 (patch) | |
tree | f0fd71d1ef7144ca0aefe7aa139cc8958963e691 /src | |
parent | 11a7f22939d21558df919cab44b8fbe36ab5dae0 (diff) |
net-match: fix Driver= match
It should match on the driver of the parent device.
Diffstat (limited to 'src')
-rw-r--r-- | src/network/networkd-network.c | 2 | ||||
-rw-r--r-- | src/udev/net/link-config.c | 2 |
2 files changed, 2 insertions, 2 deletions
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", |