- 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 a197bdf95e940a76da7869555119b2e63a411aee..2aba64e52143d87ba93df66a800e5c90e508a502 100644 (file)
--- a/device-mapper-dmsetup-export.patch
+++ b/device-mapper-dmsetup-export.patch
@@ -1,7 +1,7 @@
-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:
+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;
  }
  
@@ -16,6 +16,7 @@ diff -urp LVM2.2.03.00.orig/libdm/dm-tools/dmsetup.c LVM2.2.03.00/libdm/dm-tools
 +      const char *name = NULL;
 +      const char *uuid = NULL;
 +      struct dm_info info;
++      struct dm_deps *deps;
 +
 +      if (names)
 +              name = names->name;
@@ -85,6 +86,28 @@ diff -urp LVM2.2.03.00.orig/libdm/dm-tools/dmsetup.c LVM2.2.03.00/libdm/dm-tools
 +              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)
@@ -95,7 +118,7 @@ diff -urp LVM2.2.03.00.orig/libdm/dm-tools/dmsetup.c LVM2.2.03.00/libdm/dm-tools
  /* Show target names and their version numbers */
  static int _targets(CMD_ARGS)
  {
-@@ -6232,6 +6319,7 @@ static struct command _dmsetup_commands[
+@@ -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},
@@ -103,10 +126,10 @@ diff -urp LVM2.2.03.00.orig/libdm/dm-tools/dmsetup.c LVM2.2.03.00/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 -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
+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
@@ -121,7 +144,7 @@ diff -urp LVM2.2.03.00.orig/man/dmsetup.8_main LVM2.2.03.00/man/dmsetup.8_main
  .de CMD_HELP
  .  BR help
  .  RB [ -c | -C | --columns ]
-@@ -651,6 +659,9 @@ device. Device names on output can be cu
+@@ -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