- fix run dir problems (got messed up during update)

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

diff --git a/device-mapper-dmsetup-export.patch b/device-mapper-dmsetup-export.patch
index 029e8fabf0688b5a275654afcc5b9cbe6abe7971..a197bdf95e940a76da7869555119b2e63a411aee 100644 (file)
--- a/device-mapper-dmsetup-export.patch
+++ b/device-mapper-dmsetup-export.patch
@@ -1,38 +1,7 @@
----
- man/dmsetup.8.in |    7 ++++
- tools/dmsetup.c  |   88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 95 insertions(+)
-
---- 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
-+.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,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
---- 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 @@
+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;
  }
  
@@ -126,11 +95,39 @@
  /* Show target names and their version numbers */
  static int _targets(CMD_ARGS)
  {
-@@ -5139,6 +5226,7 @@
-       {"stats", "<command> [<options>] [<devices>]", 1, -1, 1, 1, _stats},
-       {"status", "[<device>] [--noflush] [--target <target_type>]", 0, -1, 1, 0, _status},
-       {"table", "[<device>] [--target <target_type>] [--showkeys]", 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},
        {"wait", "<device> [<event_nr>] [--noflush]", 0, 2, 0, 0, _wait},
-       {"mknodes", "[<device>]", 0, -1, 1, 0, _mknodes},
-       {"mangle", "[<device>]", 0, -1, 1, 0, _mangle},
+       {"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