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

diff --git a/device-mapper-dmsetup-export.patch b/device-mapper-dmsetup-export.patch
index 53c3ba7..ef21a68 100644
--- a/device-mapper-dmsetup-export.patch
+++ b/device-mapper-dmsetup-export.patch
@@ -1,44 +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
-@@ -48,6 +48,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 ]
-@@ -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
-+.CMD_EXPORT
-+.br
-+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
-Index: LVM2.2.02.98/tools/dmsetup.c
-===================================================================
---- LVM2.2.02.98.orig/tools/dmsetup.c
-+++ LVM2.2.02.98/tools/dmsetup.c
-@@ -2194,6 +2194,93 @@ out:
+diff -ur LVM2.2.03.02.orig/libdm/dm-tools/dmsetup.c LVM2.2.03.02/libdm/dm-tools/dmsetup.c
+--- LVM2.2.03.02.orig/libdm/dm-tools/dmsetup.c	2019-03-22 16:55:55.393000000 +0100
++++ LVM2.2.03.02/libdm/dm-tools/dmsetup.c	2019-03-22 17:00:55.046000000 +0100
+@@ -2551,6 +2551,93 @@
  	return r;
  }
  
@@ -132,11 +95,39 @@ Index: LVM2.2.02.98/tools/dmsetup.c
  /* Show target names and their version numbers */
  static int _targets(CMD_ARGS)
  {
-@@ -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},
+@@ -6230,6 +6317,7 @@
+ 	{"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},
+ 	{"mknodes", "[<device>...]", 0, -1, 1, 0, _mknodes},
+ 	{"mangle", "[<device>...]", 0, -1, 1, 0, _mangle},
+diff -ur LVM2.2.03.02.orig/man/dmsetup.8_main LVM2.2.03.02/man/dmsetup.8_main
+--- LVM2.2.03.02.orig/man/dmsetup.8_main	2019-03-22 16:55:55.394000000 +0100
++++ LVM2.2.03.02/man/dmsetup.8_main	2019-03-22 17:00:55.047000000 +0100
+@@ -59,6 +59,14 @@
+ .
+ .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 @@
+ \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