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

diff --git a/device-mapper-dmsetup-export.patch b/device-mapper-dmsetup-export.patch
index 7ea1a4b..a197bdf 100644
--- a/device-mapper-dmsetup-export.patch
+++ b/device-mapper-dmsetup-export.patch
@@ -1,41 +1,7 @@
----
- man/dmsetup.8.in |    7 ++++
- 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 ]
- .HP
-+.B dmsetup export
-+.RI [ device_name ]
-+.HP
- .B dmsetup help
- .RB [ \-c | \-C | \-\-columns ]
- .HP
-@@ -309,6 +312,11 @@ device_name in subsequent dmsetup comman
- \fBblkdevname\fP (block device name),
- \fBdevname\fP (map name for device-mapper devices, equal to blkdevname otherwise).
- .HP
-+.B export
-+.RI [ device_name ]
-+.br
-+Outputs information in key/value format to be imported by other programs.
-+.HP
- .B help
- .RB [ \-c | \-C | \-\-columns ]
- .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);
+diff -urp LVM2.2.03.00.orig/libdm/dm-tools/dmsetup.c LVM2.2.03.00/libdm/dm-tools/dmsetup.c
+--- LVM2.2.03.00.orig/libdm/dm-tools/dmsetup.c	2018-10-21 13:36:20.379416609 +0000
++++ LVM2.2.03.00/libdm/dm-tools/dmsetup.c	2018-10-21 14:20:38.626416609 +0000
+@@ -2557,6 +2557,93 @@ out:
  	return r;
  }
  
@@ -129,17 +95,39 @@ 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},
- 	{"stats", "<command> [<options>] [<devices>]", 1, -1, 1, 1, _stats},
- 	{"status", "[<device>] [--noflush] [--target <target_type>]", 0, -1, 1, 0, _status},
+@@ -6232,6 +6319,7 @@ static struct command _dmsetup_commands[
+ 	{"stats", "<command> [<options>] [<device>...]", 1, -1, 1, 1, _stats},
+ 	{"status", "[<device>...] [--noflush] [--target <target_type>]", 0, -1, 2, 0, _status},
+ 	{"table", "[<device>...] [--concise] [--target <target_type>] [--showkeys]", 0, -1, 2, 0, _status},
 +	{"export", "[<device>]", 0, 1, 1, 0, _export},
- 	{"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},
+ 	{"mknodes", "[<device>...]", 0, -1, 1, 0, _mknodes},
+ 	{"mangle", "[<device>...]", 0, -1, 1, 0, _mangle},
+diff -urp LVM2.2.03.00.orig/man/dmsetup.8_main LVM2.2.03.00/man/dmsetup.8_main
+--- LVM2.2.03.00.orig/man/dmsetup.8_main	2018-10-21 13:36:20.380416609 +0000
++++ LVM2.2.03.00/man/dmsetup.8_main	2018-10-21 14:20:38.625416609 +0000
+@@ -59,6 +59,14 @@ dmsetup \(em low level logical volume ma
+ .
+ .HP
+ .B dmsetup
++.de CMD_EXPORT
++.  BR export
++.  RI [ device_name ]
++..
++.CMD_EXPORT
++.
++.HP
++.B dmsetup
+ .de CMD_HELP
+ .  BR help
+ .  RB [ -c | -C | --columns ]
+@@ -651,6 +659,9 @@ device. Device names on output can be cu
+ \fBdevname\fP (map name for device-mapper devices, equal to blkdevname otherwise).
+ .
+ .HP
++.CMD_EXPORT
++Outputs information in key/value format to be imported by other programs.
++.HP
+ .CMD_HELP
+ .br
+ Outputs a summary of the commands available, optionally including