From: Karel Zak <kzak@redhat.com>
Date: Wed, 25 May 2016 14:11:51 +0000 (+0200)
Subject: lsblk: use ID_WWN_WITH_EXTENSION is possible
X-Git-Tag: v2.28.1~35
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=3b94a098b04c581be353e71a212a6964b53dd640;p=thirdparty%2Futil-linux.git

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>
---

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