diff options
| author | Tom Gundersen <teg@jklm.no> | 2014-12-04 18:12:55 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2014-12-04 18:53:47 +0100 |
| commit | 7eb08da4b388b920c8a894b1500c9cc7dc1f31ef (patch) | |
| tree | 04e8739827b83b3a4e1bbc50697b58f157afe90d /src/network | |
| parent | 03e8fdb34610c498e8c7fbe0ae18b53fe28cfbd1 (diff) | |
udev: net_setup - allow matching on OriginalName=
This has been requested repeatedly, so let's give it a go. We explicitly do not allow matching
on names that have already been changed (from a previous udev run, or otherwise), and matching
on unpredictable names (ethX) is discouraged (but not currently disallowed).
We also currently allow:
[Match]
Name=veth0
[Link]
Name=my-name0
SomeOtherSetting=true
Which means that the link file will be applied the first time it is invoked, but
not on subsequent invocations, which may be surprising.
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/networkd-netdev.c | 2 | ||||
| -rw-r--r-- | src/network/networkd-network.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c index b75eab9cd8..a277576a7a 100644 --- a/src/network/networkd-netdev.c +++ b/src/network/networkd-netdev.c @@ -654,7 +654,7 @@ static int netdev_load_one(Manager *manager, const char *filename) { if (net_match_config(NULL, NULL, NULL, NULL, NULL, netdev_raw->match_host, netdev_raw->match_virt, netdev_raw->match_kernel, netdev_raw->match_arch, - NULL, NULL, NULL, NULL, NULL, NULL) <= 0) + NULL, NULL, NULL, NULL, NULL, NULL, false) <= 0) return 0; if (!NETDEV_VTABLE(netdev_raw)) { diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 6cfae75029..cb111382f5 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -216,7 +216,7 @@ int network_get(Manager *manager, struct udev_device *device, udev_device_get_driver(udev_device_get_parent(device)), udev_device_get_property_value(device, "ID_NET_DRIVER"), udev_device_get_devtype(device), - ifname)) { + ifname, false)) { log_debug("%-*s: found matching network '%s'", IFNAMSIZ, ifname, network->filename); *ret = network; |