]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
rule: make ID_SYSFS_ATTRIBUTE_MODEL also accept product_name
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 22 Jan 2022 06:20:06 +0000 (15:20 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Sun, 23 Jan 2022 03:54:37 +0000 (12:54 +0900)
rules.d/50-udev-default.rules.in

index 685b59a78aea2461615d4dc0740654003ebd92b6..dcc7a776300b13a9cbf3c0eca27cf77f3f96dcd8 100644 (file)
@@ -105,7 +105,10 @@ SUBSYSTEM=="ptp", ATTR{clock_name}=="KVM virtual PTP", SYMLINK += "ptp_kvm"
 
 SUBSYSTEM=="ptp", ATTR{clock_name}=="hyperv", SYMLINK += "ptp_hyperv"
 
-SUBSYSTEM=="dmi", ENV{ID_SYSFS_ATTRIBUTE_MODEL}=="", ENV{ID_VENDOR}="$attr{sys_vendor}", ENV{ID_MODEL}="$attr{product_name}"
-SUBSYSTEM=="dmi", ENV{ID_SYSFS_ATTRIBUTE_MODEL}=="product_version", ENV{ID_VENDOR}="$attr{sys_vendor}", ENV{ID_MODEL}="$attr{product_version}"
+SUBSYSTEM!="dmi", GOTO="dmi_end"
+ENV{ID_VENDOR}="$attr{sys_vendor}"
+ENV{ID_SYSFS_ATTRIBUTE_MODEL}=="|product_name", ENV{ID_MODEL}="$attr{product_name}"
+ENV{ID_SYSFS_ATTRIBUTE_MODEL}=="product_version", ENV{ID_MODEL}="$attr{product_version}"
+LABEL="dmi_end"
 
 LABEL="default_end"