aboutsummaryrefslogtreecommitdiffstats
path: root/misc-utils/lsblk.c
diff options
context:
space:
mode:
authorKarel Zak <kzak@redhat.com>2016-05-25 16:11:51 +0200
committerKarel Zak <kzak@redhat.com>2016-05-25 16:11:51 +0200
commit4d7ef267ccc7675c319d04179c3c2a9396af1e93 (patch)
tree69ac1a2e4f9402b6eb67aeb4d7d574cd312b01a6 /misc-utils/lsblk.c
parent702b6b5f7f77f198e921e51a83e31afcc6e81d0e (diff)
downloadutil-linux-4d7ef267ccc7675c319d04179c3c2a9396af1e93.tar.gz
lsblk: use ID_WWN_WITH_EXTENSION is possible
Addresses: https://github.com/karelzak/util-linux/issues/321 Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'misc-utils/lsblk.c')
-rw-r--r--misc-utils/lsblk.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 0e76f43268..5b239f183f 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -547,8 +547,13 @@ static int get_udev_properties(struct blkdev_cxt *cxt)
cxt->partuuid = xstrdup(data);
if ((data = udev_device_get_property_value(dev, "ID_PART_ENTRY_FLAGS")))
cxt->partflags = xstrdup(data);
- if ((data = udev_device_get_property_value(dev, "ID_WWN")))
+
+ data = udev_device_get_property_value(dev, "ID_WWN_WITH_EXTENSION");
+ if (!data)
+ data = udev_device_get_property_value(dev, "ID_WWN");
+ if (data)
cxt->wwn = xstrdup(data);
+
if ((data = udev_device_get_property_value(dev, "ID_SERIAL_SHORT")))
cxt->serial = xstrdup(data);
udev_device_unref(dev);