From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 26 Apr 2023 03:05:36 +0000 (+0900)
Subject: udev/iocost: use ID_MODEL_FROM_DATABASE if exists
X-Git-Tag: v254-rc1~626^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c413ae18b542cbd76c59d61deae49c404bd23de8;p=thirdparty%2Fsystemd.git

udev/iocost: use ID_MODEL_FROM_DATABASE if exists

To make the rule consistent with 'iocost query'.
---

diff --git a/rules.d/90-iocost.rules b/rules.d/90-iocost.rules
index 50f778a0ae9..6c31cae56b5 100644
--- a/rules.d/90-iocost.rules
+++ b/rules.d/90-iocost.rules
@@ -13,7 +13,11 @@ ENV{DEVTYPE}=="partition", GOTO="iocost_end"
 
 ACTION=="remove", GOTO="iocost_end"
 
-ENV{ID_MODEL}!="", IMPORT{builtin}="hwdb 'block::name:$env{ID_MODEL}:fwrev:$env{ID_REVISION}:'"
+ENV{.MODEL}=""
+ENV{ID_MODEL}!="", ENV{.MODEL}="$env{ID_MODEL}"
+ENV{ID_MODEL_FROM_DATABASE}!="", ENV{.MODEL}="$env{ID_MODEL_FROM_DATABASE}"
+
+ENV{.MODEL}!="", IMPORT{builtin}="hwdb 'block::name:$env{.MODEL}:fwrev:$env{ID_REVISION}:'"
 
 ENV{IOCOST_SOLUTIONS}!="", RUN+="iocost apply $env{DEVNAME}"