thirdparty/util-linux
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

lsblk: prefer MODEL from udev DB

Browse source 
sysfs device model is truncated to 16 characters:

> cat /sys/block/sda/device/model
Crucial_CT128MX1
> udevadm info --query=property /dev/sda | grep MODEL=
ID_MODEL=Crucial_CT128MX100SSD1

sysfs uses INQUARY response which has the 16 characters limitation and
udev uses something else.

Addresses: https://github.com/karelzak/util-linux/issues/690
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2018-09-10 10:29:37 +02:00
parent 27afe50168
commit 13cbc6f21c
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
misc-utils/lsblk.c
View file

@ -302,6 +302,7 @@ struct blkdev_cxt {
char *partflags; /* partition flags */ char *partflags; /* partition flags */
char *wwn; /* storage WWN */ char *wwn; /* storage WWN */
char *serial; /* disk serial number */ char *serial; /* disk serial number */
char *model; /* disk model */
int npartitions; /* # of partitions this device has */ int npartitions; /* # of partitions this device has */
int nholders; /* # of devices mapped directly to this device int nholders; /* # of devices mapped directly to this device
@ -412,6 +413,7 @@ static void reset_blkdev_cxt(struct blkdev_cxt *cxt)
free(cxt->partlabel); free(cxt->partlabel);
free(cxt->wwn); free(cxt->wwn);
free(cxt->serial); free(cxt->serial);
free(cxt->model);
ul_unref_path(cxt->sysfs); ul_unref_path(cxt->sysfs);
@ -603,6 +605,9 @@ static int get_udev_properties(struct blkdev_cxt *cxt)
if ((data = udev_device_get_property_value(dev, "ID_SERIAL_SHORT"))) if ((data = udev_device_get_property_value(dev, "ID_SERIAL_SHORT")))
cxt->serial = xstrdup(data); cxt->serial = xstrdup(data);
if ((data = udev_device_get_property_value(dev, "ID_MODEL")))
cxt->model = xstrdup(data);
udev_device_unref(dev); udev_device_unref(dev);
cxt->probed = 1; cxt->probed = 1;
DBG(DEV, ul_debugobj(cxt, "%s: found udev properties", cxt->name)); DBG(DEV, ul_debugobj(cxt, "%s: found udev properties", cxt->name));
@ -1064,8 +1069,13 @@ static void set_scols_data(struct blkdev_cxt *cxt, int col, int id, struct libsc
ul_path_read_string(cxt->sysfs, &str, "queue/add_random"); ul_path_read_string(cxt->sysfs, &str, "queue/add_random");
break; break;
case COL_MODEL: case COL_MODEL:
if (!cxt->partition && cxt->nslaves == 0) if (!cxt->partition && cxt->nslaves == 0) {
get_udev_properties(cxt);
if (cxt->model)
str = xstrdup(cxt->model);
else
ul_path_read_string(cxt->sysfs, &str, "device/model"); ul_path_read_string(cxt->sysfs, &str, "device/model");
}
break; break;
case COL_SERIAL: case COL_SERIAL:
if (!cxt->partition && cxt->nslaves == 0) { if (!cxt->partition && cxt->nslaves == 0) {