X-Git-Url: https://git.tld-linux.org/?p=packages%2Flvm2.git;a=blobdiff_plain;f=device-mapper-dmsetup-export.patch;h=53c3ba7bc4b390f457b6987f12b4b97d23cca944;hp=7ea1a4b863041b9e12b4f26be63f13867937bde1;hb=1c585277cdd121fb2c6870d085ed1ec050029590;hpb=c931ebc2a5d62f8e4c4c1cee6db70a8d5a1231a9

diff --git a/device-mapper-dmsetup-export.patch b/device-mapper-dmsetup-export.patch
index 7ea1a4b..53c3ba7 100644
--- a/device-mapper-dmsetup-export.patch
+++ b/device-mapper-dmsetup-export.patch
@@ -7,35 +7,38 @@ 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 ]
+@@ -48,6 +48,14 @@ dmsetup \(em low level logical volume ma
+ .
  .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,11 @@ device. Device names on output can be cu
  \fBdevname\fP (map name for device-mapper devices, equal to blkdevname otherwise).
+ .
  .HP
-+.B export
-+.RI [ device_name ]
++.CMD_EXPORT
 +.br
 +Outputs information in key/value format to be imported by other programs.
++.
 +.HP
- .B help
- .RB [ \-c | \-C | \-\-columns ]
+ .CMD_HELP
  .br
+ Outputs a summary of the commands available, optionally including
 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);
+@@ -2194,6 +2194,93 @@ out:
  	return r;
  }
  
@@ -129,11 +132,7 @@ 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},
+@@ -5155,6 +5242,7 @@ static struct command _dmsetup_commands[
  	{"deps", "[-o <options>] [<device>]", 0, -1, 1, 0, _deps},
  	{"stats", "<command> [<options>] [<devices>]", 1, -1, 1, 1, _stats},
  	{"status", "[<device>] [--noflush] [--target <target_type>]", 0, -1, 1, 0, _status},
@@ -141,5 +140,3 @@ Index: LVM2.2.02.98/tools/dmsetup.c
  	{"table", "[<device>] [--target <target_type>] [--showkeys]", 0, -1, 1, 0, _status},
  	{"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},