From: Karel Zak <kzak@redhat.com>
Date: Wed, 2 Jun 2021 11:32:43 +0000 (+0200)
Subject: lsblk: use ID_MODEL_ENC is possible
X-Git-Tag: v2.38-rc1~483
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1775aaf1d7465102eab2b51c0e9c2797cdf08189;p=thirdparty%2Futil-linux.git

lsblk: use ID_MODEL_ENC is possible

Fix: https://github.com/karelzak/util-linux/issues/1098
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/misc-utils/lsblk-properties.c b/misc-utils/lsblk-properties.c
index 6429db06e1..9ffe2e4afd 100644
--- a/misc-utils/lsblk-properties.c
+++ b/misc-utils/lsblk-properties.c
@@ -10,6 +10,7 @@
 #include "mangle.h"
 #include "path.h"
 #include "nls.h"
+#include "strutils.h"
 
 #include "lsblk.h"
 
@@ -114,7 +115,11 @@ static struct lsblk_devprop *get_properties_by_udev(struct lsblk_device *ld)
 		if (data)
 			prop->serial = xstrdup(data);
 
-		if ((data = udev_device_get_property_value(dev, "ID_MODEL")))
+		if ((data = udev_device_get_property_value(dev, "ID_MODEL_ENC"))) {
+			prop->model = xstrdup(data);
+			unhexmangle_string(prop->model);
+			normalize_whitespace((unsigned char *) prop->model);
+		} else if ((data = udev_device_get_property_value(dev, "ID_MODEL")))
 			prop->model = xstrdup(data);
 
 		udev_device_unref(dev);