From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 22 Jan 2022 06:20:06 +0000 (+0900)
Subject: rule: make ID_SYSFS_ATTRIBUTE_MODEL also accept product_name
X-Git-Tag: v251-rc1~468^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a93306a22efc376cf2389479069ba9dc8875c9e3;p=thirdparty%2Fsystemd.git

rule: make ID_SYSFS_ATTRIBUTE_MODEL also accept product_name
---

diff --git a/rules.d/50-udev-default.rules.in b/rules.d/50-udev-default.rules.in
index 685b59a78ae..dcc7a776300 100644
--- a/rules.d/50-udev-default.rules.in
+++ b/rules.d/50-udev-default.rules.in
@@ -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"