]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
lsblk: use ID_SCSI_SERIAL when available
authorSven Wiltink <swiltink@transip.nl>
Fri, 8 Feb 2019 09:53:21 +0000 (10:53 +0100)
committerKarel Zak <kzak@redhat.com>
Mon, 11 Feb 2019 09:37:27 +0000 (10:37 +0100)
Signed-off-by: Karel Zak <kzak@redhat.com>
misc-utils/lsblk-properties.c

index 30168dd48b10d5a1e332f3e8ff271cc58eb930e8..530332fec8e2e198ccc46c072852cdd861bc4959 100644 (file)
@@ -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);