X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=device-mapper-dmsetup-export.patch;h=029e8fabf0688b5a275654afcc5b9cbe6abe7971;hb=e2c8246fa43770f4fd2309faf6059388b618f400;hp=7ea1a4b863041b9e12b4f26be63f13867937bde1;hpb=f898c9f5078ef79c7356b63b78cdcc6d06a00634;p=packages%2Flvm2.git

diff --git a/device-mapper-dmsetup-export.patch b/device-mapper-dmsetup-export.patch
index 7ea1a4b..029e8fa 100644
--- a/device-mapper-dmsetup-export.patch
+++ b/device-mapper-dmsetup-export.patch
@@ -3,39 +3,36 @@
  tools/dmsetup.c  |   88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 95 insertions(+)
 
-Index: LVM2.2.02.98/man/dmsetup.8.in
-===================================================================
---- LVM2.2.02.116.orig/man/dmsetup.8.in	2015-01-30 16:19:53.000000000 +0000
-+++ LVM2.2.02.116/man/dmsetup.8.in	2015-02-03 21:05:01.635601115 +0000
-@@ -19,6 +19,9 @@ dmsetup \(em low level logical volume ma
- .IR options ]
- .RI [ device_name ]
+--- LVM2.2.02.149/man/dmsetup.8.in.orig	2016-04-05 22:16:49.848604442 +0200
++++ LVM2.2.02.149/man/dmsetup.8.in	2016-04-06 15:59:35.582595117 +0200
+@@ -48,6 +48,14 @@
+ .
  .HP
-+.B dmsetup export
-+.RI [ device_name ]
+ .B dmsetup
++.de CMD_EXPORT
++.  BR export
++.  RI [ device_name ]
++..
++.CMD_EXPORT
++.
 +.HP
- .B dmsetup help
- .RB [ \-c | \-C | \-\-columns ]
- .HP
-@@ -309,6 +312,11 @@ device_name in subsequent dmsetup comman
- \fBblkdevname\fP (block device name),
++.B dmsetup
+ .de CMD_HELP
+ .  BR help
+ .  RB [ \-c | \-C | \-\-columns ]
+@@ -629,6 +637,9 @@
  \fBdevname\fP (map name for device-mapper devices, equal to blkdevname otherwise).
+ .
  .HP
-+.B export
-+.RI [ device_name ]
-+.br
++.CMD_EXPORT
 +Outputs information in key/value format to be imported by other programs.
 +.HP
- .B help
- .RB [ \-c | \-C | \-\-columns ]
+ .CMD_HELP
  .br
-Index: LVM2.2.02.98/tools/dmsetup.c
-===================================================================
---- LVM2.2.02.98.orig/tools/dmsetup.c
-+++ LVM2.2.02.98/tools/dmsetup.c
-@@ -1706,10 +1706,97 @@ static int _status(CMD_ARGS)
-       out:
- 	dm_task_destroy(dmt);
+ Outputs a summary of the commands available, optionally including
+--- LVM2.2.02.130/tools/dmsetup.c.orig	2015-09-09 18:44:39.471523160 +0200
++++ LVM2.2.02.130/tools/dmsetup.c	2015-09-09 18:48:33.918179988 +0200
+@@ -2189,6 +2189,93 @@
  	return r;
  }
  
@@ -129,17 +126,11 @@ Index: LVM2.2.02.98/tools/dmsetup.c
  /* Show target names and their version numbers */
  static int _targets(CMD_ARGS)
  {
- 	int r = 0;
- 	struct dm_task *dmt;
-@@ -3056,10 +3143,11 @@ static struct command _commands[] = {
- 	{"ls", "[--target <target_type>] [--exec <command>] [-o <options>] [--tree]", 0, 0, 0, 0, _ls},
- 	{"info", "[<device>]", 0, -1, 1, 0, _info},
- 	{"deps", "[-o <options>] [<device>]", 0, -1, 1, 0, _deps},
+@@ -5139,6 +5226,7 @@
  	{"stats", "<command> [<options>] [<devices>]", 1, -1, 1, 1, _stats},
  	{"status", "[<device>] [--noflush] [--target <target_type>]", 0, -1, 1, 0, _status},
-+	{"export", "[<device>]", 0, 1, 1, 0, _export},
  	{"table", "[<device>] [--target <target_type>] [--showkeys]", 0, -1, 1, 0, _status},
++	{"export", "[<device>]", 0, 1, 1, 0, _export},
  	{"wait", "<device> [<event_nr>] [--noflush]", 0, 2, 0, 0, _wait},
  	{"mknodes", "[<device>]", 0, -1, 1, 0, _mknodes},
  	{"mangle", "[<device>]", 0, -1, 1, 0, _mangle},
- 	{"udevcreatecookie", "", 0, 0, 0, 0, _udevcreatecookie},