X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-network.c;h=14fa92aeaf62d6cce055ef23439696f5a3927c1c;hb=12e0f830f592ec4c6bb49ac7ae1e0e84f74105e3;hp=fd1befcebffcce019893b73226d9add99e8ed5de;hpb=2cc412b59353576cece2d5b30c6a39c70552f0a0;p=elogind.git diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index fd1befceb..14fa92aea 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -74,7 +74,7 @@ static int network_load_one(Manager *manager, const char *filename) { network->dhcp_domainname = true; r = config_parse(NULL, filename, file, "Match\0Network\0Address\0Route\0DHCPv4\0", config_item_perf_lookup, - (void*) network_gperf_lookup, false, false, network); + (void*) network_network_gperf_lookup, false, false, network); if (r < 0) { log_warning("Could not parse config file %s: %s", filename, strerror(-r)); return r; @@ -177,9 +177,11 @@ int network_get(Manager *manager, struct udev_device *device, Network **ret) { network->match_driver, network->match_type, network->match_name, network->match_host, network->match_virt, network->match_kernel, + network->match_arch, udev_device_get_sysattr_value(device, "address"), udev_device_get_property_value(device, "ID_PATH"), udev_device_get_driver(udev_device_get_parent(device)), + udev_device_get_property_value(device, "ID_NET_DRIVER"), udev_device_get_devtype(device), udev_device_get_sysname(device))) { log_debug("%s: found matching network '%s'",