ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lsblk: use ID_MODEL_ENC is possible 

Fix: https://github.com/karelzak/util-linux/issues/1098
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2021-06-02 13:32:43 +02:00
parent 0e54ac3980
commit 1775aaf1d7
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
misc-utils/lsblk-properties.c
View File

@ -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);