- fix conditional

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

diff --git a/device-mapper-dmsetup-export.patch b/device-mapper-dmsetup-export.patch
index daa131afeddbf84a28a7539921eae4f14824a105..2aba64e52143d87ba93df66a800e5c90e508a502 100644 (file)
--- a/device-mapper-dmsetup-export.patch
+++ b/device-mapper-dmsetup-export.patch
@@ -1,48 +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.98.orig/man/dmsetup.8.in
-+++ LVM2.2.02.98/man/dmsetup.8.in
-@@ -17,10 +17,13 @@ dmsetup \- low level logical volume mana
- .RB [{ \-\-addnodeoncreate | \-\-addnodeonresume }]
- .RB [ \-\-readahead
- .RI [ \+ ]< sectors >| auto | none ]
- .RE
- .br
-+.B dmsetup export
-+.I [ device_name ]
-+.br
- .B dmsetup deps
- .RB [ \-o
- .IR options ]
- .RI [ device_name ]
- .br
-@@ -283,10 +286,14 @@ Otherwise a table is read from standard
- The optional uuid can be used in place of
- device_name in subsequent dmsetup commands.
- If successful a device will appear as
- /dev/mapper/<device-name>.
- See below for information on the table format.
-+.IP \fBexport
-+.I [ device_name ]
-+.br
-+Outputs information in key/value format to be imported by other programs.
- .br
- .TP
- .B deps
- .RB [ \-o
- .IR options ]
-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 -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;
  }
  
@@ -57,6 +16,7 @@ Index: LVM2.2.02.98/tools/dmsetup.c
 +      const char *name = NULL;
 +      const char *uuid = NULL;
 +      struct dm_info info;
++      struct dm_deps *deps;
 +
 +      if (names)
 +              name = names->name;
@@ -126,6 +86,28 @@ Index: LVM2.2.02.98/tools/dmsetup.c
 +              printf("\n");
 +      }
 +
++      dm_task_destroy(dmt);
++
++      if (!(dmt = dm_task_create(DM_DEVICE_DEPS)))
++              goto out;
++
++      name = NULL;
++      if (names)
++              name = names->name;
++      else if (argc == 2)
++              name = argv[1];
++
++      if (!_set_task_device(dmt, name, 0))
++              goto out;
++
++      if (!dm_task_run(dmt))
++              goto out;
++
++      if (!(deps = dm_task_get_deps(dmt)))
++              goto out;
++
++      printf("DM_DEPS=%d\n", deps->count);
++
 +      r = 1;
 +      out:
 +      if (dmt)
@@ -136,17 +118,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[] = {
-       {"message", "<device> <sector> <message>", 2, -1, 0, _message},
-       {"ls", "[--target <target_type>] [--exec <command>] [-o options] [--tree]", 0, 0, 0, _ls},
-       {"info", "[<device>]", 0, -1, 1, _info},
-       {"deps", "[-o options] [<device>]", 0, -1, 1, _deps},
-       {"status", "[<device>] [--noflush] [--target <target_type>]", 0, -1, 1, _status},
-+      {"export", "[<device>]", 0, 1, 1, _export},
-       {"table", "[<device>] [--target <target_type>] [--showkeys]", 0, -1, 1, _status},
-       {"wait", "<device> [<event_nr>] [--noflush]", 0, 2, 0, _wait},
-       {"mknodes", "[<device>]", 0, -1, 1, _mknodes},
-       {"mangle", "[<device>]", 0, -1, 1, _mangle},
-       {"udevcreatecookie", "", 0, 0, 0, _udevcreatecookie},
+@@ -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},
++      {"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},
+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
++.de CMD_EXPORT
++.  BR export
++.  RI [ device_name ]
++..
++.CMD_EXPORT
++.
++.HP
++.B dmsetup
+ .de CMD_HELP
+ .  BR help
+ .  RB [ -c | -C | --columns ]
+@@ -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
++.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