r604 - in devmapper/trunk/debian: . patches

Tue Jul 15 21:36:16 UTC 2008

Author: waldi
Date: Tue Jul 15 21:36:16 2008
New Revision: 604

Log:
debian/changelog: Update.
debian/patches/dmsetup-export.patch: Export target types.


Modified:
   devmapper/trunk/debian/changelog
   devmapper/trunk/debian/patches/dmsetup-export.patch

Modified: devmapper/trunk/debian/changelog
==============================================================================

--- devmapper/trunk/debian/changelog	(original)
+++ devmapper/trunk/debian/changelog	Tue Jul 15 21:36:16 2008
@@ -1,3 +1,9 @@
+devmapper (2:1.02.27-2) UNRELEASED; urgency=low
+
+  * Update dmsetup export patch to export target types. (closes: #486780)
+
+ -- Bastian Blank <waldi at debian.org>  Tue, 15 Jul 2008 23:33:50 +0200
+
 devmapper (2:1.02.27-1) unstable; urgency=low
 
   * New upstream version. (closes: #488981)

Modified: devmapper/trunk/debian/patches/dmsetup-export.patch
==============================================================================
--- devmapper/trunk/debian/patches/dmsetup-export.patch	(original)
+++ devmapper/trunk/debian/patches/dmsetup-export.patch	Tue Jul 15 21:36:16 2008
@@ -1,6 +1,6 @@
 --- a/dmsetup/dmsetup.c
 +++ b/dmsetup/dmsetup.c
-@@ -1076,6 +1076,64 @@
+@@ -1076,6 +1076,82 @@
  	return r;
  }
  
@@ -14,6 +14,10 @@
 +	const char *name = NULL;
 +	const char *uuid;
 +	struct dm_info info;
++	void *next = NULL;
++	uint64_t start, length;
++	char *target_type;
++	char *params;
 +
 +	if (argc == 1 && !_switches[UUID_ARG] && !_switches[MAJOR_ARG])
 +		return 0;
@@ -51,9 +55,23 @@
 +	printf("DM_MAJOR=%d\n", info.major);
 +	printf("DM_MINOR=%d\n", info.minor);
 +
-+	if (!(uuid = dm_task_get_uuid(dmt)))
-+		uuid = "";
-+	printf("DM_UUID=\"%s\"\n", uuid);
++	if (info.target_count != -1)
++		printf("DM_TARGET_COUNT=%d\n", info.target_count);
++
++	next = dm_get_next_target(dmt, next, &start, &length, &target_type, &params);
++	if (target_type) {
++		printf("DM_TARGET_TYPES=%s", target_type);
++		while (next) {
++			next = dm_get_next_target(dmt, next, &start, &length,
++						  &target_type, &params);
++			if (target_type)
++				printf(",%s", target_type);
++		}
++		printf("\n");
++	}
++
++	if ((uuid = dm_task_get_uuid(dmt)) && *uuid)
++		printf("DM_UUID=\"%s\"\n", uuid);
 +
 +	r = 1;
 +
@@ -65,7 +83,7 @@
  /* Show target names and their version numbers */
  static int _targets(int argc __attribute((unused)), char **argv __attribute((unused)), void *data __attribute((unused)))
  {
-@@ -2122,6 +2180,7 @@
+@@ -2122,6 +2198,7 @@
  	{"targets", "", 0, 0, _targets},
  	{"version", "", 0, 0, _version},
  	{"setgeometry", "<device> <cyl> <head> <sect> <start>", 5, 5, _setgeometry},

