- updated to 2.02.162, partial PLD merge (patches)

[packages/lvm2.git] / device-mapper-dmsetup-export.patch

diff --git a/device-mapper-dmsetup-export.patch b/device-mapper-dmsetup-export.patch
index 53c3ba7bc4b390f457b6987f12b4b97d23cca944..029e8fabf0688b5a275654afcc5b9cbe6abe7971 100644 (file)
--- a/device-mapper-dmsetup-export.patch
+++ b/device-mapper-dmsetup-export.patch
@@ -3,11 +3,9 @@
  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
+--- 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
@@ -22,23 +20,19 @@ Index: LVM2.2.02.98/man/dmsetup.8.in
  .de CMD_HELP
  .  BR help
  .  RB [ \-c | \-C | \-\-columns ]
-@@ -629,6 +637,11 @@ device. Device names on output can be cu
+@@ -629,6 +637,9 @@
  \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:
+--- 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;
  }
  
@@ -132,11 +126,11 @@ 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},
+@@ -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},