From b2de0b7d44219251abc8ac91b8cf161e15ab0935 Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@redhat.com>
Date: Wed, 13 Mar 2002 16:19:17 +0000
Subject: [PATCH] dmsetup display uuid

---
 libdm/ioctl/libdevmapper.c | 5 +++++
 libdm/libdevmapper.h       | 1 +
 libdm/libdm-common.c       | 4 ++++
 tools/dmsetup.c            | 4 ++++
 4 files changed, 14 insertions(+)

diff --git a/libdm/ioctl/libdevmapper.c b/libdm/ioctl/libdevmapper.c
index b94d7efab..d301d7cf1 100644
--- a/libdm/ioctl/libdevmapper.c
+++ b/libdm/ioctl/libdevmapper.c
@@ -77,6 +77,11 @@ int dm_task_get_info(struct dm_task *dmt, struct dm_info *info)
 	return 1;
 }
 
+const char *dm_task_get_uuid(struct dm_task *dmt)
+{
+	return (dmt->dmi->uuid);
+}
+
 struct dm_deps *dm_task_get_deps(struct dm_task *dmt)
 {
 	return (struct dm_deps *) (((void *) dmt->dmi) + dmt->dmi->data_start);
diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h
index bc97b8ac1..2de9463c6 100644
--- a/libdm/libdevmapper.h
+++ b/libdm/libdevmapper.h
@@ -76,6 +76,7 @@ struct dm_deps {
 int dm_get_library_version(char *version, size_t size);
 int dm_task_get_driver_version(struct dm_task *dmt, char *version, size_t size);
 int dm_task_get_info(struct dm_task *dmt, struct dm_info *dmi);
+const char *dm_task_get_uuid(struct dm_task *dmt);
 
 struct dm_deps *dm_task_get_deps(struct dm_task *dmt);
 
diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c
index 5c97e85ae..ac0994d1e 100644
--- a/libdm/libdm-common.c
+++ b/libdm/libdm-common.c
@@ -111,6 +111,8 @@ int dm_task_set_name(struct dm_task *dmt, const char *name)
 		return 0;
 	}
 
+	log_very_verbose("Setting name: %s", dmt->dev_name);
+
         return 1;
 }
 
@@ -126,6 +128,8 @@ int dm_task_set_uuid(struct dm_task *dmt, const char *uuid)
 		return 0;
 	}
 
+	log_very_verbose("Setting uuid: %s", dmt->uuid);
+
 	return 1;
 }
 
diff --git a/tools/dmsetup.c b/tools/dmsetup.c
index 4faf98682..6d63cccaa 100644
--- a/tools/dmsetup.c
+++ b/tools/dmsetup.c
@@ -230,6 +230,7 @@ static int _resume(int argc, char **argv)
 static int _info(int argc, char **argv)
 {
 	int r = 0;
+	char *uuid;
 
 	/* remove <dev_name> */
 	struct dm_task *dmt;
@@ -264,6 +265,9 @@ static int _info(int argc, char **argv)
 	if (info.target_count != -1)
 		printf("Number of targets: %d\n", info.target_count);
 
+	if ((uuid = dm_task_get_uuid(dmt)) && *uuid)
+		printf("UUID: %s\n", uuid);
+
 	r = 1;
 
       out: