From 1775aaf1d7465102eab2b51c0e9c2797cdf08189 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 2 Jun 2021 13:32:43 +0200 Subject: [PATCH] lsblk: use ID_MODEL_ENC is possible Fix: https://github.com/karelzak/util-linux/issues/1098 Signed-off-by: Karel Zak --- misc-utils/lsblk-properties.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/misc-utils/lsblk-properties.c b/misc-utils/lsblk-properties.c index 6429db06e..9ffe2e4af 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);