morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

udev/rules.d: import hwdb before calling net_id builtin

Browse Source 
The commit cdcb1eeeb8 adds
ID_NET_NAME_INCLUDE_DOMAIN property support in net_id builtin.
The property is basically set through hwdb. However, previously hwdb was
imported after calling net_id builtin, hence when net_id is called, the
property was never set.

This makes hwdb is imported before calling net_id builtin, so that the
property is set when net_id is called if hwdb has an entry about that
for the interface.

Follow-up for cdcb1eeeb8.
Fixes #37758.
This commit is contained in:
Yu Watanabe
2025-06-12 18:25:54 +09:00
committed by Luca Boccassi
parent d3b7e63068
commit a7deadd763
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rules.d/75-net-description.rules
View File

@@ -5,12 +5,13 @@ SUBSYSTEM!="net", GOTO="net_end"
IMPORT{builtin}="hwdb 'net:naming:dr$env{ID_NET_DRIVER}:'"
IMPORT{builtin}="net_id"
SUBSYSTEMS=="usb", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb"
SUBSYSTEMS=="usb", GOTO="net_end"
SUBSYSTEMS=="usb", GOTO="import_net_id"
SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}"
SUBSYSTEMS=="pci", IMPORT{builtin}="hwdb --subsystem=pci"
LABEL="import_net_id"
IMPORT{builtin}="net_id"
LABEL="net_end"