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 50f778a0ae97e2bdcc2b79a656e5fabf7451d682..6c31cae56b529eaeac4b82a6f1b6a7e7c984af6a 100644 (file)
--- 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}"