Version bump, with new output-field-name prefix support.

Package-Manager: portage-2.1.5.4

4 files changed, 386 insertions, 12 deletions

diff --git a/sys-fs/device-mapper/ChangeLog b/sys-fs/device-mapper/ChangeLog
index 8a04dd103f8f..f2079740d81f 100644
--- a/sys-fs/device-mapper/ChangeLog
+++ b/sys-fs/device-mapper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/device-mapper
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.113 2008/04/21 18:22:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.114 2008/06/08 19:10:22 robbat2 Exp $
+
+*device-mapper-1.02.26 (08 Jun 2008)
+
+  08 Jun 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/device-mapper-1.02.26-export-format.diff,
+  +device-mapper-1.02.26.ebuild:
+  Version bump, with new output-field-name prefix support.
 
   21 Apr 2008; Jeroen Roovers <jer@gentoo.org>
   device-mapper-1.02.24-r1.ebuild:
diff --git a/sys-fs/device-mapper/Manifest b/sys-fs/device-mapper/Manifest
index 075c5fe8f821..30019d2a85df 100644
--- a/sys-fs/device-mapper/Manifest
+++ b/sys-fs/device-mapper/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.02.22-dmeventd.initd 547 RMD160 dd73fd37016d4e3a168009574651bf31f5ec0189 SHA1 dcd11d182a3888f2efdbb535ee9f3bb5ebb4ee46 SHA256 6b55e8cac8f47ea7c00ef66ce078826628842b6d13bbebed875bec2188b5e675
 AUX 64-device-mapper.rules-1.02.19 1247 RMD160 2fc15996575c44ffb5a12c16236e221157ff15e6 SHA1 67cd5da22219dba8232e7a95bd7f328d6eb30d90 SHA256 b8a7570321c735b06cfa97cff10a8edffcf508d4e54bd6730e482cb7bdd25347
 AUX 64-device-mapper.rules-1.02.22 999 RMD160 e29014e213c2d41ae360419c038d5644cd931021 SHA1 f3542c4294dcf4e2c4f50d3421b5399f5ab06975 SHA256 84544cac9d4de6cfc44cec816836f194f5f69fbb74cbdd07073f96dae427c0ed
@@ -8,6 +5,7 @@ AUX 64-device-mapper.rules-1.02.22-r5 1010 RMD160 3dbb70b60b0c86a77fb9d0e8a0a9cd
 AUX device-mapper-1.02.22-export-format-r1.diff 11073 RMD160 ac3adb7316dc4f6bb7e9ea3bcf54f8b8b878570d SHA1 208c3f92a9a257e62fb6f7b8600b22b486d473bb SHA256 8b071762684b9c72dafe7bbd0e9a508999d3d0bc34ced088baa7a206d859f331
 AUX device-mapper-1.02.22-export-format.diff 11410 RMD160 dac695aa0eef0adfa1dafea428a8c7412d96ebee SHA1 d46b4c791a4f53c932d3664362e123eecf2c39cc SHA256 e7ded5533a0a6409be967e259ecea39395e783686431567112744743d3b9e553
 AUX device-mapper-1.02.24-export-format.diff 11126 RMD160 28fe4d018152f4a36b07106b8323ab5ec0a0cb7b SHA1 5d0a88f91164082297f8b86450ccfeebc2f34dde SHA256 30e6c0c153bdcd68681ec5a0ebf2c2aee21daa2f22759f82b432e412183d2754
+AUX device-mapper-1.02.26-export-format.diff 11120 RMD160 c7abc681027f44a1a2f978d56de9c506464036bd SHA1 348b4d1bd2bb11a03d2d1f43fe568956aeae49d7 SHA256 bd2e40f67a2322565dbcabba3dbda0b16ddb4f5d0587465b10aa0497b1bbaf76
 AUX device-mapper.conf-1.02.22-r3 15 RMD160 1954cbfeea6eeed764a6344039d9c1eb58f7b00a SHA1 0dd47dfb811946a11fbde987e2ce1e105ed7fafb SHA256 57777904f12a35617e5a4193c964ebb32396452487fd02353e71e16e7b46bc22
 AUX device-mapper.rc 615 RMD160 741f1f771665e33f995442567376060a749d56c1 SHA1 a44e73c73865757d8d00161bc07374de535e70bd SHA256 730753883de0e992a0bfa31038780edf31d0957fdbef304fd8880c6d0dc7798e
 AUX device-mapper.rc-1.02.22-r3 620 RMD160 9764c73cf28a20c2b21ddc5e76b5ee7e23ca6ac4 SHA1 d0f9e04adae75a74225831e33520d378f36f7355 SHA256 db8f0867bb4c35c53a59944bdb6c64844b044a937fa7ce43f1bc35f17268b6bc
@@ -17,6 +15,7 @@ DIST device-mapper.1.02.19.tgz 183064 RMD160 00b584c67856ab18323bcc2918aed5ac419
 DIST device-mapper.1.02.22.tgz 189726 RMD160 8bf9986536c49f53c398d6a2180e21e1235bea18 SHA1 a4533872c32951a1b549bb9207a13b7e4dae0701 SHA256 ff833a6cd6246686f5b3f5692fd6597f1ffbc60f08929e5fe68304cdafb61595
 DIST device-mapper.1.02.24.tgz 192995 RMD160 fa73dd0bd973c6e6f2dabbb065aa176a2a5ea3a4 SHA1 b22e76bd07b41f46a6d4a3d06429d9787fc4987f SHA256 a0bd3de63e0d12da8d82153a2e3b53e59d92e0fc52712a4fa0f997f6d5baaa56
 DIST device-mapper.1.02.25.tgz 193095 RMD160 da8f34bdf61a54f956d7eed86dfcb130cd3bc917 SHA1 788327a7358efce148865595aa4e779eaa87beae SHA256 eb7e3234dd8c7651403df6485918efd765d408e2618a0f6cde51c2f231f8507c
+DIST device-mapper.1.02.26.tgz 194047 RMD160 9c024f3771e3ebbe1381fde5cd9e8c40e724dacb SHA1 e3f5a6a46be26324b9816f86b82fd88d02a150d9 SHA256 dbe5b92a06316b628c40afadac6ca4eac1abde8282d11c6e99461bc0b32b2075
 EBUILD device-mapper-1.02.19-r1.ebuild 1739 RMD160 59d0786bbec0a0572c9c41935fd681f0e8235b6c SHA1 de5e8c959fae34ab3a2b684fe5211e763f69008f SHA256 90de2882a1ca5a279ac15650a5e0212e7997ee3bb0fab018a79f2400fc6f4f08
 EBUILD device-mapper-1.02.19.ebuild 1631 RMD160 ebb985a60f5f098e7322e8602bd9f5f403bf3fb8 SHA1 1049f88ec398bc2642fad01375424d0339248ed1 SHA256 b66cb6d9c7ecc5b769667f6884e5b9462dabcaa7ae6f4e196d70421a1f1ede71
 EBUILD device-mapper-1.02.22-r1.ebuild 2029 RMD160 f8f7a284100d366f700b5419c1065dee2e90d70e SHA1 a0aad925f78e61908ef505697ec038ebd1418774 SHA256 0f383d1be0f8f2111aca9a32f7a01487779ec493f7d6b290a92cbfd56920369d
@@ -27,12 +26,6 @@ EBUILD device-mapper-1.02.22.ebuild 1853 RMD160 a9d4a38a94e59535f65c4925e6296380
 EBUILD device-mapper-1.02.24-r1.ebuild 2200 RMD160 ae639e40cb5ea71afa511302505b34b2f73dcd92 SHA1 e3a5c3e631dd0b3a4d279a681b211c6df5a79b6a SHA256 1099ab9383140b658f43cde8519746d790fab851d3e3c24647963dc87cea8e12
 EBUILD device-mapper-1.02.24.ebuild 2172 RMD160 df8dc287151ac787ce06eafc2e2c7d84e2a52c58 SHA1 e96f91e97990283ab4fad2b9c6afface910ca567 SHA256 f92b915d0a677b7da38c5cf9de141c0254d245de45a4bb4a2967998bf4821cd2
 EBUILD device-mapper-1.02.25.ebuild 2209 RMD160 5663bd0d59c1cd96aea4cc687461d6c6f5933391 SHA1 8dd25dc08b1e8308249a21dcedbc79563242c5fd SHA256 6bf4e832edebc55af6e6103395050eb0a306d8c3369e2be07fee3386ce9f2621
-MISC ChangeLog 20030 RMD160 c6b982dc16c27aaba134ccbd4c38145f4f5649fa SHA1 0c8ee49c07eb2f2c14007a45ab12e5c5b3d39ec4 SHA256 7c944e5ed649fdfacb1193056e79d5ba0bbbb89aa420bacbb5dd8bfd092a2b4c
+EBUILD device-mapper-1.02.26.ebuild 2210 RMD160 7356f6c42c9d114554f7cb6ec8f29e80f2211f75 SHA1 86cdd05ad38b0f36687535e3a9ec8f071e164d07 SHA256 cb64b08193d50a05370fe18ce395554d99961be0fef1d4531d2924612e83a985
+MISC ChangeLog 20269 RMD160 0d69dd47d475b1ddfc350490a7924930988c0db7 SHA1 9b833e26d90cc6f3d26cdf55be0f443496db8730 SHA256 bb62f3adc09b7ac3920878c3bb612d900a4f6a9459bdfea1d1e725c1bda2ce18
 MISC metadata.xml 300 RMD160 ede7eb0cde3ab4e83a90578f08e068486a2a59cd SHA1 2f199ce422f4fad87bcbdcb681d8197620bae236 SHA256 4f6e65a7f6e72548a3d0c35a34f7a119dc7f5c13dfc0820939bc8d1b72b75a4d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFIDjdfj9hvisErhMIRAsHTAKC8GdErKwg0YmwyMZ9AssR093Wg9gCgjy0f
-vNpg+DeH+vBP5pV+ua3S7eo=
-=cXul
------END PGP SIGNATURE-----
diff --git a/sys-fs/device-mapper/device-mapper-1.02.26.ebuild b/sys-fs/device-mapper/device-mapper-1.02.26.ebuild
new file mode 100644
index 000000000000..4966914a72ec
--- /dev/null
+++ b/sys-fs/device-mapper/device-mapper-1.02.26.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/device-mapper-1.02.26.ebuild,v 1.1 2008/06/08 19:10:22 robbat2 Exp $
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Device mapper ioctl library for use with LVM2 utilities"
+HOMEPAGE="http://sources.redhat.com/dm/"
+SRC_URI="ftp://sources.redhat.com/pub/dm/${PN}.${PV}.tgz
+	ftp://sources.redhat.com/pub/dm/old/${PN}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux"
+
+DEPEND="selinux? ( sys-libs/libselinux )"
+RDEPEND="!<sys-fs/udev-115-r1
+		${DEPEND}"
+
+S="${WORKDIR}/${PN}.${PV}"
+
+src_unpack() {
+	unpack ${A}
+	EPATCH_OPTS="-p1 -d${S}" epatch "${FILESDIR}"/device-mapper-1.02.26-export-format.diff
+}
+
+src_compile() {
+	econf \
+		--sbindir=/sbin \
+		--enable-dmeventd \
+		$(use_enable selinux) \
+		CLDFLAGS="${LDFLAGS}" || die "econf failed"
+	emake || die "compile problem"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+
+	# move shared libs to /
+	mv "${D}"/usr/$(get_libdir) "${D}"/ || die "move libdir"
+	dolib.a lib/ioctl/libdevmapper.a || die "dolib.a"
+	gen_usr_ldscript libdevmapper.so
+
+	insinto /etc
+	doins "${FILESDIR}"/dmtab
+	insinto /lib/rcscripts/addons
+	doins "${FILESDIR}"/dm-start.sh
+
+	newinitd "${FILESDIR}"/device-mapper.rc-1.02.22-r3 device-mapper || die
+	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
+
+	newinitd "${FILESDIR}"/1.02.22-dmeventd.initd dmeventd || die
+	dolib.a dmeventd/libdevmapper-event.a || die
+	gen_usr_ldscript libdevmapper-event.so
+
+	insinto /etc/udev/rules.d/
+	newins "${FILESDIR}"/64-device-mapper.rules-1.02.22-r5 64-device-mapper.rules
+
+	dodoc INSTALL INTRO README VERSION WHATS_NEW
+}
+
+pkg_preinst() {
+	local l="${ROOT}"/$(get_libdir)/libdevmapper.so.1.01
+	[[ -e ${l} ]] && cp "${l}" "${D}"/$(get_libdir)/
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libdevmapper.so.1.01
+
+	elog "device-mapper volumes are no longer automatically created for"
+	elog "baselayout-2 users. If you are using baselayout-2, be sure to"
+	elog "run: # rc-update add device-mapper boot"
+}
diff --git a/sys-fs/device-mapper/files/device-mapper-1.02.26-export-format.diff b/sys-fs/device-mapper/files/device-mapper-1.02.26-export-format.diff
new file mode 100644
index 000000000000..2d4861229599
--- /dev/null
+++ b/sys-fs/device-mapper/files/device-mapper-1.02.26-export-format.diff
@@ -0,0 +1,300 @@
+diff -Nuar --exclude '*.orig' device-mapper.1.02.26.orig/dmsetup/dmsetup.c device-mapper.1.02.26/dmsetup/dmsetup.c
+--- device-mapper.1.02.26.orig/dmsetup/dmsetup.c	2008-06-06 11:53:08.000000000 -0700
++++ device-mapper.1.02.26/dmsetup/dmsetup.c	2008-06-08 11:57:58.491838798 -0700
+@@ -108,6 +108,7 @@
+ enum {
+ 	READ_ONLY = 0,
+ 	COLS_ARG,
++	EXPORT_ARG,
+ 	EXEC_ARG,
+ 	FORCE_ARG,
+ 	GID_ARG,
+@@ -140,7 +141,8 @@
+ 	DR_TASK = 1,
+ 	DR_INFO = 2,
+ 	DR_DEPS = 4,
+-	DR_TREE = 8	/* Complete dependency tree required */
++	DR_TREE = 8,	/* Complete dependency tree required */
++	DR_TABLE = 0x10, /* table is required, not just info */
+ } report_type_t;
+ 
+ static int _switches[NUM_SWITCHES];
+@@ -1124,8 +1126,13 @@
+ 			name = argv[1];
+ 	}
+ 
+-	if (!(dmt = dm_task_create(DM_DEVICE_INFO)))
+-		return 0;
++	if (_report_type & DR_TABLE ) {
++		if (!(dmt = dm_task_create(DM_DEVICE_TABLE)))
++			return 0;
++	} else {
++		if (!(dmt = dm_task_create(DM_DEVICE_INFO)))
++			return 0;
++	}
+ 
+ 	if (!_set_task_device(dmt, name, 0))
+ 		goto out;
+@@ -1589,6 +1596,16 @@
+ 	return dm_report_field_uint32(rh, field, &value);
+ }
+ 
++static int _int_disp(struct dm_report *rh,
++		      struct dm_pool *mem __attribute((unused)),
++		      struct dm_report_field *field, const void *data,
++		      void *private __attribute((unused)))
++{
++	const int value = *(const int *)data;
++
++	return dm_report_field_int(rh, field, &value);
++}
++
+ static int _dm_name_disp(struct dm_report *rh,
+ 			 struct dm_pool *mem __attribute((unused)),
+ 			 struct dm_report_field *field, const void *data,
+@@ -1700,6 +1717,66 @@
+ }
+ 
+ 
++static int _dm_info_cleartext_status_disp(struct dm_report *rh,
++					 struct dm_pool *mem __attribute((unused)),
++					 struct dm_report_field *field, const void *data,
++					 void *private __attribute((unused)))
++{
++	const char *buf = "NOTPRESENT";
++	const struct dm_info *info = data;
++
++	if (info->exists) {
++		if (info->suspended)
++			buf = "SUSPENDED";
++		else
++			buf = info->read_only ? " READONLY" : "ACTIVE";
++	}
++		
++	return dm_report_field_string(rh, field, &buf);
++}
++
++static int _dm_info_target_types_disp(struct dm_report *rh,
++					 struct dm_pool *mem __attribute((unused)),
++					 struct dm_report_field *field, const void *data,
++					 void *private __attribute((unused)))
++{
++	char buf[1024];
++	char *dest = buf;
++	int remains = sizeof(buf);
++	int written;
++	const char *s = buf;
++	struct dm_task *dmt = (struct dm_task *) data;
++	void *next = NULL;
++	uint64_t start, length;
++	char *target_type = NULL;
++	char *params;
++
++
++	buf[0] = '\0';
++	
++	next = dm_get_next_target(dmt, next, &start, &length,
++				  &target_type, &params);
++	if (target_type) {
++		written = snprintf(dest, remains, "%s", target_type);
++		dest += written;
++		remains -= written;
++
++		while (remains > 0 && next) {
++			next = dm_get_next_target(dmt, next, &start, &length,
++						  &target_type, &params);
++			if (target_type) {
++				written = snprintf(dest, remains, ",%s", target_type);
++				dest += written;
++				remains -= written;
++			}
++		}
++	}
++
++	buf[sizeof(buf)-1] = '\0';
++	
++	return dm_report_field_string(rh, field, &s);
++}
++
+ static int _dm_info_devno_disp(struct dm_report *rh, struct dm_pool *mem,
+ 			       struct dm_report_field *field, const void *data,
+ 			       void *private)
+@@ -1923,11 +2000,12 @@
+ 	{ DR_INFO, "Mapped Device Information", "", _info_get_obj },
+ 	{ DR_DEPS, "Mapped Device Relationship Information", "", _deps_get_obj },
+ 	{ DR_TREE, "Mapped Device Relationship Information", "", _tree_get_obj },
++	{ DR_TABLE, "Mapped Device Table", "", _task_get_obj },
+ 	{ 0, "", "", NULL },
+ };
+ 
+ /* Column definitions */
+-#define OFFSET_OF(strct, field) ((unsigned int) &((struct strct *)NULL)->field)
++#define OFFSET_OF(strct, field) ((unsigned long) &((struct strct *)NULL)->field)
+ #define STR (DM_REPORT_FIELD_TYPE_STRING)
+ #define NUM (DM_REPORT_FIELD_TYPE_NUMBER)
+ #define FIELD_O(type, strct, sorttype, head, field, width, func, id, desc) {DR_ ## type, sorttype, OFFSET_OF(strct, field), width, id, head, &_ ## func ## _disp, desc},
+@@ -1942,6 +2020,7 @@
+ FIELD_F(TASK, NUM, "RAhead", 6, dm_read_ahead, "read_ahead", "Read ahead in sectors.")
+ 
+ FIELD_F(INFO, STR, "Stat", 4, dm_info_status, "attr", "(L)ive, (I)nactive, (s)uspended, (r)ead-only, read-(w)rite.")
++FIELD_F(INFO, STR, "State", 1, dm_info_cleartext_status, "status", "State as cleartext.")
+ FIELD_F(INFO, STR, "Tables", 6, dm_info_table_loaded, "tables_loaded", "Which of the live and inactive table slots are filled.")
+ FIELD_F(INFO, STR, "Suspended", 9, dm_info_suspended, "suspended", "Whether the device is suspended.")
+ FIELD_F(INFO, STR, "Read-only", 9, dm_info_read_only, "readonly", "Whether the device is read-only or writeable.")
+@@ -1952,6 +2031,11 @@
+ FIELD_O(INFO, dm_info, NUM, "Targ", target_count, 4, int32, "segments", "Number of segments in live table, if present.")
+ FIELD_O(INFO, dm_info, NUM, "Event", event_nr, 6, uint32, "events", "Number of most recent event.")
+ 
++FIELD_O(INFO, dm_info, NUM, "RO", read_only, 2, int, "read_only", "Read only.")
++FIELD_O(INFO, dm_info, NUM, "Ex", exists, 2, int, "exists", "Exists.")
++FIELD_O(INFO, dm_info, NUM, "Susp", suspended, 4, int, "suspended", "Suspended.")
++FIELD_O(INFO, dm_info, NUM, "tab_live", live_table, 8, int, "table_live", "Live table.")
++FIELD_O(INFO, dm_info, NUM, "tab_inact", inactive_table, 9, int, "table_inactive", "Inactive table.")
+ FIELD_O(DEPS, dm_deps, NUM, "#Devs", count, 5, int32, "device_count", "Number of devices used by this one.")
+ FIELD_F(TREE, STR, "DevNames", 8, dm_deps_names, "devs_used", "List of names of mapped devices used by this one.")
+ FIELD_F(DEPS, STR, "DevNos", 6, dm_deps, "devnos_used", "List of device numbers of devices used by this one.")
+@@ -1959,6 +2043,7 @@
+ FIELD_F(TREE, NUM, "#Refs", 5, dm_tree_parents_count, "device_ref_count", "Number of mapped devices referencing this one.")
+ FIELD_F(TREE, STR, "RefNames", 8, dm_tree_parents_names, "names_using_dev", "List of names of mapped devices using this one.")
+ FIELD_F(TREE, STR, "RefDevNos", 9, dm_tree_parents_devs, "devnos_using_dev", "List of device numbers of mapped devices using this one.")
++FIELD_F(TABLE, STR, "Targettypes", 32, dm_info_target_types, "target_types", "Used target types.")
+ {0, 0, 0, 0, "", "", NULL, NULL},
+ /* *INDENT-ON* */
+ };
+@@ -1969,13 +2054,15 @@
+ #undef FIELD_F
+ 
+ static const char *default_report_options = "name,major,minor,attr,open,segments,events,uuid";
++static const char *default_export_options = "name,major,minor,status,read_only,exists,suspended,table_live,table_inactive,open,segments,events,uuid,target_types";
+ 
+ static int _report_init(struct command *c)
+ {
+-	char *options = (char *) default_report_options;
++	char *default_options = (char *) default_report_options;
++	char *options;
+ 	const char *keys = "";
+ 	const char *separator = " ";
+-	int aligned = 1, headings = 1, buffered = 1, field_prefixes = 0;
++	int aligned = 1, headings = 1, buffered = 1, field_prefixes = 0, export = 0;
+ 	uint32_t flags = 0;
+ 	size_t len = 0;
+ 	int r = 0;
+@@ -1995,6 +2082,15 @@
+ 		field_prefixes = 1;
+ 	}
+ 
++	if (_switches[EXPORT_ARG]) {
++		default_options = (char *) default_export_options;
++		separator = "\n";
++		aligned = 0;
++		headings = 0;
++		export = 1;
++	}
++
++	options = default_options;
+ 	if (_switches[OPTIONS_ARG] && _string_args[OPTIONS_ARG]) {
+ 		if (*_string_args[OPTIONS_ARG] != '+')
+ 			options = _string_args[OPTIONS_ARG];
+@@ -2040,6 +2136,9 @@
+ 	if (field_prefixes)
+ 		flags |= DM_REPORT_OUTPUT_FIELD_NAME_PREFIX;
+ 
++	if (export)
++		flags |= DM_REPORT_OUTPUT_EXPORT;
++
+ 	if (!(_report = dm_report_init(&_report_type,
+ 				       _report_types, _report_fields,
+ 				       options, separator, flags, keys, NULL)))
+@@ -2118,7 +2217,8 @@
+ 	fprintf(out, "dmsetup [--version] [-v|--verbose [-v|--verbose ...]]\n"
+ 		"        [-r|--readonly] [--noopencount] [--nolockfs]\n"
+ 		"        [--readahead [+]<sectors>|auto|none]\n"
+-		"        [-c|-C|--columns] [-o <fields>] [-O|--sort <sort_fields>]\n"
++ 		"        [-c|-C|--columns] [-e|--export]\n"
++ 		"        [-o <fields>] [-O|--sort <sort_fields>]\n"
+ 		"        [--nameprefixes] [--noheadings] [--separator <separator>]\n\n");
+ 	for (i = 0; _commands[i].name; i++)
+ 		fprintf(out, "\t%s %s\n", _commands[i].name, _commands[i].help);
+@@ -2469,6 +2569,7 @@
+ 	static struct option long_options[] = {
+ 		{"readonly", 0, &ind, READ_ONLY},
+ 		{"columns", 0, &ind, COLS_ARG},
++		{"export", 0, &ind, EXPORT_ARG},
+ 		{"exec", 1, &ind, EXEC_ARG},
+ 		{"force", 0, &ind, FORCE_ARG},
+ 		{"gid", 1, &ind, GID_ARG},
+@@ -2549,12 +2650,16 @@
+ 
+ 	optarg = 0;
+ 	optind = OPTIND_INIT;
+-	while ((ind = -1, c = GETOPTLONG_FN(*argc, *argv, "cCfGj:m:Mno:O:ru:Uv",
++	while ((ind = -1, c = GETOPTLONG_FN(*argc, *argv, "cCefGj:m:Mno:O:ru:Uv",
+ 					    long_options, NULL)) != -1) {
+ 		if (c == ':' || c == '?')
+ 			return 0;
+ 		if (c == 'c' || c == 'C' || ind == COLS_ARG)
+ 			_switches[COLS_ARG]++;
++		if (c == 'e' || ind == EXPORT_ARG) {
++			_switches[EXPORT_ARG]++;
++			_switches[COLS_ARG]++;
++		}
+ 		if (c == 'f' || ind == FORCE_ARG)
+ 			_switches[FORCE_ARG]++;
+ 		if (c == 'r' || ind == READ_ONLY)
+diff -Nuar --exclude '*.orig' device-mapper.1.02.26.orig/lib/libdevmapper.h device-mapper.1.02.26/lib/libdevmapper.h
+--- device-mapper.1.02.26.orig/lib/libdevmapper.h	2008-04-19 17:11:08.000000000 -0700
++++ device-mapper.1.02.26/lib/libdevmapper.h	2008-06-08 11:55:22.039615314 -0700
+@@ -740,6 +740,7 @@
+ #define DM_REPORT_OUTPUT_BUFFERED		0x00000002
+ #define DM_REPORT_OUTPUT_HEADINGS		0x00000004
+ #define DM_REPORT_OUTPUT_FIELD_NAME_PREFIX	0x00000008
++#define DM_REPORT_OUTPUT_EXPORT			0x00000010
+ 
+ struct dm_report *dm_report_init(uint32_t *report_types,
+ 				 const struct dm_report_object_type *types,
+diff -Nuar --exclude '*.orig' device-mapper.1.02.26.orig/lib/libdm-report.c device-mapper.1.02.26/lib/libdm-report.c
+--- device-mapper.1.02.26.orig/lib/libdm-report.c	2008-06-06 12:07:47.000000000 -0700
++++ device-mapper.1.02.26/lib/libdm-report.c	2008-06-08 11:54:39.618236313 -0700
+@@ -13,6 +13,7 @@
+  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
++#include <ctype.h>
+ #include "libdevmapper.h"
+ #include "list.h"
+ #include "log.h"
+@@ -803,6 +804,8 @@
+ 	char buf[4096];
+ 	int32_t width;
+ 	uint32_t align;
++	const char *fname;
++	char tmp_char;
+ 
+ 	if (list_empty(&rh->rows))
+ 		return 1;
+@@ -851,6 +854,25 @@
+ 				}
+ 			}
+ 
++			if (rh->flags & DM_REPORT_OUTPUT_EXPORT) {
++				fname = rh->fields[field->props->field_num].id;
++				if (!dm_pool_grow_object(rh->mem, "DM_", strlen("DM_"))) {
++					log_error("dm_report: Unable to extend output line");
++					goto bad;
++				}
++				while (fname && fname[0]) {
++					tmp_char = toupper(fname[0]);
++					if (!dm_pool_grow_object(rh->mem, &tmp_char, 1)) {
++						log_error("dm_report: Unable to extend output line");
++						goto bad;
++					}
++					fname++;
++				}
++				if (!dm_pool_grow_object(rh->mem, "=", strlen("="))) {
++					log_error("dm_report: Unable to extend output line");
++					goto bad;
++				}
++			}
+ 			repstr = field->report_string;
+ 			width = field->props->width;
+ 			if (!(rh->flags & DM_REPORT_OUTPUT_ALIGNED)) {