shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-26 08:55:40 +03:00
Code

Merge 92476c814e into f7078de515

Browse Source
This commit is contained in:
Lennart Poettering 2024-10-25 11:41:16 -07:00 committed by GitHub
commit f72a0b0678
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hwdb.d/20-net-ifname.hwdb
View File

@ -3,3 +3,7 @@
# Dell iDRAC Virtual USB NIC
usb:v413CpA102*
ID_NET_NAME_FROM_DATABASE=idrac
# Disable inclusion of PCI domain in interface names on Azure MANA
pci:v00001414d000000ba*
ID_NET_NAME_INCLUDE_DOMAIN=0

11
src/udev/udev-builtin-net_id.c
View File

@ -650,7 +650,16 @@ static int get_pci_slot_specifiers(
* where the slot makes up the upper 5 bits. */
func += slot * 8;
if (domain > 0 && asprintf(&domain_spec, "P%u", domain) < 0)
/* Include the PCI domain in the name if the ID_NET_NAME_INCLUDE_DOMAIN property says so, if it is
* set. If it is not set, include it if the domain is non-zero. */
r = device_get_property_bool(dev, "ID_NET_NAME_INCLUDE_DOMAIN");
if (r < 0) {
if (r != -ENOENT)
log_device_warning_errno(dev, r, "Failed to read property \"ID_NET_NAME_INCLUDE_DOMAIN\", ignoring: %m");
r = domain > 0;
}
if (r > 0 && asprintf(&domain_spec, "P%u", domain) < 0)
return log_oom_debug();
if (asprintf(&bus_and_slot_spec, "p%us%u", bus, slot) < 0)