From: Sven Wiltink <swiltink@transip.nl>
Date: Fri, 8 Feb 2019 09:53:21 +0000 (+0100)
Subject: lsblk: use ID_SCSI_SERIAL when available
X-Git-Tag: v2.34-rc1~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2f6513c106f5522555a8c129f4e6579b9642c65;p=thirdparty%2Futil-linux.git

lsblk: use ID_SCSI_SERIAL when available

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/misc-utils/lsblk-properties.c b/misc-utils/lsblk-properties.c
index 30168dd48b..530332fec8 100644
--- a/misc-utils/lsblk-properties.c
+++ b/misc-utils/lsblk-properties.c
@@ -96,8 +96,12 @@ static struct lsblk_devprop *get_properties_by_udev(struct lsblk_device *ld)
 		if (data)
 			prop->wwn = xstrdup(data);
 
-		if ((data = udev_device_get_property_value(dev, "ID_SERIAL_SHORT")))
+		data = udev_device_get_property_value(dev, "ID_SCSI_SERIAL");
+		if(!data)
+			data = udev_device_get_property_value(dev, "ID_SERIAL_SHORT");
+		if (data)
 			prop->serial = xstrdup(data);
+
 		if ((data = udev_device_get_property_value(dev, "ID_MODEL")))
 			prop->model = xstrdup(data);