- updated to 2.03.23, cleanup, minor merge from PLD

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

diff --git a/device-mapper-dmsetup-export.patch b/device-mapper-dmsetup-export.patch
index 37d8d46e46cbb881cd901a1d1a12828199be5606..2aba64e52143d87ba93df66a800e5c90e508a502 100644 (file)
--- a/device-mapper-dmsetup-export.patch
+++ b/device-mapper-dmsetup-export.patch
@@ -1,7 +1,7 @@
-diff -ur LVM2.2.03.21.orig/libdm/dm-tools/dmsetup.c LVM2.2.03.21/libdm/dm-tools/dmsetup.c
---- LVM2.2.03.21.orig/libdm/dm-tools/dmsetup.c 2023-07-10 11:25:56.509112198 +0200
-+++ LVM2.2.03.21/libdm/dm-tools/dmsetup.c      2023-07-10 11:27:18.722275271 +0200
-@@ -2563,6 +2563,116 @@
+diff -urNpa LVM2.2.03.23.orig/libdm/dm-tools/dmsetup.c LVM2.2.03.23/libdm/dm-tools/dmsetup.c
+--- LVM2.2.03.23.orig/libdm/dm-tools/dmsetup.c 2023-12-03 19:56:43.002779419 +0100
++++ LVM2.2.03.23/libdm/dm-tools/dmsetup.c      2023-12-03 19:56:52.195888521 +0100
+@@ -2565,6 +2565,116 @@ out:
        return r;
  }
  
@@ -118,7 +118,7 @@ diff -ur LVM2.2.03.21.orig/libdm/dm-tools/dmsetup.c LVM2.2.03.21/libdm/dm-tools/
  /* Show target names and their version numbers */
  static int _targets(CMD_ARGS)
  {
-@@ -6272,6 +6382,7 @@
+@@ -6286,6 +6396,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},
@@ -126,10 +126,10 @@ diff -ur LVM2.2.03.21.orig/libdm/dm-tools/dmsetup.c LVM2.2.03.21/libdm/dm-tools/
        {"wait", "<device> [<event_nr>] [--noflush]", 0, 2, 0, 0, _wait},
        {"mknodes", "[<device>...]", 0, -1, 1, 0, _mknodes},
        {"mangle", "[<device>...]", 0, -1, 1, 0, _mangle},
-diff -ur LVM2.2.03.21.orig/man/dmsetup.8_main LVM2.2.03.21/man/dmsetup.8_main
---- LVM2.2.03.21.orig/man/dmsetup.8_main       2023-07-10 11:25:56.511112226 +0200
-+++ LVM2.2.03.21/man/dmsetup.8_main    2023-07-10 11:27:08.907136415 +0200
-@@ -61,6 +61,14 @@
+diff -urNpa LVM2.2.03.23.orig/man/dmsetup.8_main LVM2.2.03.23/man/dmsetup.8_main
+--- LVM2.2.03.23.orig/man/dmsetup.8_main       2023-12-03 19:56:43.003779431 +0100
++++ LVM2.2.03.23/man/dmsetup.8_main    2023-12-03 19:56:52.195888521 +0100
+@@ -61,6 +61,14 @@ dmsetup \(em low level logical volume ma
  .
  .HP
  .B dmsetup
@@ -144,7 +144,7 @@ diff -ur LVM2.2.03.21.orig/man/dmsetup.8_main LVM2.2.03.21/man/dmsetup.8_main
  .de CMD_HELP
  .  BR help
  .  RB [ -c | -C | --columns ]
-@@ -635,6 +643,9 @@
+@@ -642,6 +650,9 @@ device. Device names on output can be cu
  \fBdevname\fP (map name for device-mapper devices, equal to blkdevname otherwise).
  .
  .HP