diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2008-06-28 09:10:49 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2008-06-28 09:10:49 +0000 |
commit | 07e96ce5255dfccb7cf3f1ae6815f1812822995b (patch) | |
tree | a9fef622d9f7e62bf313144e8deafcef632f6077 /sys-fs/device-mapper | |
parent | Revision bump to add a pbunzip2 link. Thanks to Santiago M. Mola <coldwind@g... (diff) | |
download | historical-07e96ce5255dfccb7cf3f1ae6815f1812822995b.tar.gz historical-07e96ce5255dfccb7cf3f1ae6815f1812822995b.tar.bz2 historical-07e96ce5255dfccb7cf3f1ae6815f1812822995b.zip |
Version bump, dep for the latest lvm2.
Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-rc4-00103-g1beee8d x86_64
Diffstat (limited to 'sys-fs/device-mapper')
-rw-r--r-- | sys-fs/device-mapper/ChangeLog | 9 | ||||
-rw-r--r-- | sys-fs/device-mapper/Manifest | 5 | ||||
-rw-r--r-- | sys-fs/device-mapper/device-mapper-1.02.27.ebuild | 74 | ||||
-rw-r--r-- | sys-fs/device-mapper/files/device-mapper-1.02.27-export-format.diff | 294 |
4 files changed, 380 insertions, 2 deletions
diff --git a/sys-fs/device-mapper/ChangeLog b/sys-fs/device-mapper/ChangeLog index 2570f742c8de..4554971ffa94 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.118 2008/06/23 18:52:59 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.119 2008/06/28 09:10:48 robbat2 Exp $ + +*device-mapper-1.02.27 (28 Jun 2008) + + 28 Jun 2008; Robin H. Johnson <robbat2@gentoo.org> + +files/device-mapper-1.02.27-export-format.diff, + +device-mapper-1.02.27.ebuild: + Version bump, dep for the latest lvm2. 23 Jun 2008; Raúl Porcel <armin76@gentoo.org> device-mapper-1.02.26.ebuild: diff --git a/sys-fs/device-mapper/Manifest b/sys-fs/device-mapper/Manifest index 1997c98abc41..75c95a725e4c 100644 --- a/sys-fs/device-mapper/Manifest +++ b/sys-fs/device-mapper/Manifest @@ -6,6 +6,7 @@ AUX device-mapper-1.02.22-export-format-r1.diff 11073 RMD160 ac3adb7316dc4f6bb7e 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-1.02.27-export-format.diff 10774 RMD160 7e6b804ab39038751e0b6b2c55aef3eb32ae963f SHA1 de3512bb81a06c0b26040ce11ed141ebfcd67a37 SHA256 ddeb28b0ac4aa5c428577da4f8334afb89b48c5b0134127f130f2037f22cb0bd 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 @@ -16,6 +17,7 @@ DIST device-mapper.1.02.22.tgz 189726 RMD160 8bf9986536c49f53c398d6a2180e21e1235 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 +DIST device-mapper.1.02.27.tgz 202823 RMD160 2a18599f41b42b71d1baa720f127b4a100439d9d SHA1 6c0fd650c1b865c74d9601012cf98724b2237fa7 SHA256 669b7820a7421547468577bc3190ee4bb35c2a1395f434dee636ba2e65a38dfc 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,5 +29,6 @@ EBUILD device-mapper-1.02.24-r1.ebuild 2200 RMD160 ae639e40cb5ea71afa511302505b3 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 EBUILD device-mapper-1.02.26.ebuild 2205 RMD160 186bd93dbe53e943b796f73de4250feb53da9733 SHA1 2a6d05e39b5f797b51ef119cde6737a2f3836bf6 SHA256 cf146a63ccfb403a5cc58e444c1a056c616b1ad1695657f63cdf274065d3eac8 -MISC ChangeLog 20692 RMD160 21f581f38f3e766f2ecd9546e02012155106a204 SHA1 c1102570d3928aa1da1eaa49e4e5de55eb435ebc SHA256 6d3b11597286adf465dc6a6d3e05f9857769f5cd22f82b7c103709c7148429d3 +EBUILD device-mapper-1.02.27.ebuild 2210 RMD160 d8abb3c4bd47c7e7238d5f7bf6777afd9230359d SHA1 be8ad54eec2488c4edb6022414f2d6928267cf55 SHA256 dddeb8fcf45db8fa8ca5d47dbece20e41ef677e85d1b4e81a0459e8261da34ec +MISC ChangeLog 20909 RMD160 e3abcc8fd43154981f209447575775974d8d9f78 SHA1 7e00f8781d09411e4ff8316c192424d4d698524f SHA256 32669ea8698344d77bc26161011760b96975916147c02604f20076b39bbd0fb0 MISC metadata.xml 300 RMD160 ede7eb0cde3ab4e83a90578f08e068486a2a59cd SHA1 2f199ce422f4fad87bcbdcb681d8197620bae236 SHA256 4f6e65a7f6e72548a3d0c35a34f7a119dc7f5c13dfc0820939bc8d1b72b75a4d diff --git a/sys-fs/device-mapper/device-mapper-1.02.27.ebuild b/sys-fs/device-mapper/device-mapper-1.02.27.ebuild new file mode 100644 index 000000000000..b9a0b078e103 --- /dev/null +++ b/sys-fs/device-mapper/device-mapper-1.02.27.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.27.ebuild,v 1.1 2008/06/28 09:10:48 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.27-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.27-export-format.diff b/sys-fs/device-mapper/files/device-mapper-1.02.27-export-format.diff new file mode 100644 index 000000000000..9b1580a87e4f --- /dev/null +++ b/sys-fs/device-mapper/files/device-mapper-1.02.27-export-format.diff @@ -0,0 +1,294 @@ +diff -Nuar --exclude '*.rej' --exclude '*.orig' device-mapper.1.02.27.orig/dmsetup/dmsetup.c device-mapper.1.02.27/dmsetup/dmsetup.c +--- device-mapper.1.02.27.orig/dmsetup/dmsetup.c 2008-06-24 15:53:47.000000000 -0700 ++++ device-mapper.1.02.27/dmsetup/dmsetup.c 2008-06-28 01:53:56.048598048 -0700 +@@ -108,6 +108,7 @@ + enum { + READ_ONLY = 0, + COLS_ARG, ++ EXPORT_ARG, + EXEC_ARG, + FORCE_ARG, + GID_ARG, +@@ -142,7 +143,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]; +@@ -1126,8 +1128,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; +@@ -1591,6 +1598,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, +@@ -1702,6 +1719,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, ¶ms); ++ 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, ¶ms); ++ 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) +@@ -1925,6 +2002,7 @@ + { 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 }, + }; + +@@ -1944,6 +2022,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.") +@@ -1954,6 +2033,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.") +@@ -1961,6 +2045,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* */ + }; +@@ -1971,13 +2056,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; + int quoted = 1, columns_as_rows = 0; + uint32_t flags = 0; + size_t len = 0; +@@ -2004,6 +2091,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]; +@@ -2055,6 +2151,9 @@ + if (columns_as_rows) + flags |= DM_REPORT_OUTPUT_COLUMNS_AS_ROWS; + ++ if (export) ++ flags |= DM_REPORT_OUTPUT_EXPORT; ++ + if (!(_report = dm_report_init(&_report_type, + _report_types, _report_fields, + options, separator, flags, keys, NULL))) +@@ -2133,7 +2232,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); +@@ -2484,6 +2584,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}, +@@ -2566,12 +2667,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 '*.rej' --exclude '*.orig' device-mapper.1.02.27.orig/lib/libdevmapper.h device-mapper.1.02.27/lib/libdevmapper.h +--- device-mapper.1.02.27.orig/lib/libdevmapper.h 2008-06-24 15:53:48.000000000 -0700 ++++ device-mapper.1.02.27/lib/libdevmapper.h 2008-06-28 01:54:55.588111461 -0700 +@@ -742,6 +742,7 @@ + #define DM_REPORT_OUTPUT_FIELD_NAME_PREFIX 0x00000008 + #define DM_REPORT_OUTPUT_FIELD_UNQUOTED 0x00000010 + #define DM_REPORT_OUTPUT_COLUMNS_AS_ROWS 0x00000020 ++#define DM_REPORT_OUTPUT_EXPORT 0x00000040 + + struct dm_report *dm_report_init(uint32_t *report_types, + const struct dm_report_object_type *types, +diff -Nuar --exclude '*.rej' --exclude '*.orig' device-mapper.1.02.27.orig/lib/libdm-report.c device-mapper.1.02.27/lib/libdm-report.c +--- device-mapper.1.02.27.orig/lib/libdm-report.c 2008-06-24 17:10:36.000000000 -0700 ++++ device-mapper.1.02.27/lib/libdm-report.c 2008-06-28 01:56:39.778466634 -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" +@@ -808,6 +809,8 @@ + uint32_t align; + const char *repstr; + char buf[4096]; ++ const char *fname; ++ char tmp_char; + + if (rh->flags & DM_REPORT_OUTPUT_FIELD_NAME_PREFIX) { + if (!(field_id = strdup(rh->fields[field->props->field_num].id))) { +@@ -838,6 +841,25 @@ + return 0; + } + } ++ 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"); ++ return 0; ++ } ++ 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"); ++ return 0; ++ } ++ fname++; ++ } ++ if (!dm_pool_grow_object(rh->mem, "=", strlen("="))) { ++ log_error("dm_report: Unable to extend output line"); ++ return 0; ++ } ++ } + + repstr = field->report_string; + width = field->props->width; |