X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=device-mapper-dmsetup-export.patch;h=37d8d46e46cbb881cd901a1d1a12828199be5606;hb=2fc0c23eb249e042d2bd5892b4b14e618b4e043a;hp=9a50b7e4a5da43f4da432ad6058e31087bea0765;hpb=8780299f67c78624188b5a2a8d85e69e6724be4a;p=packages%2Flvm2.git

diff --git a/device-mapper-dmsetup-export.patch b/device-mapper-dmsetup-export.patch
index 9a50b7e..37d8d46 100644
--- a/device-mapper-dmsetup-export.patch
+++ b/device-mapper-dmsetup-export.patch
@@ -1,35 +1,7 @@
-diff -urp LVM2.2.02.177.orig/man/dmsetup.8_main LVM2.2.02.177/man/dmsetup.8_main
---- LVM2.2.02.177.orig/man/dmsetup.8_main	2017-12-18 20:44:35.000000000 +0000
-+++ LVM2.2.02.177/man/dmsetup.8_main	2018-01-26 15:24:01.378500379 +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
-diff -urp LVM2.2.02.177.orig/tools/dmsetup.c LVM2.2.02.177/tools/dmsetup.c
---- LVM2.2.02.177.orig/tools/dmsetup.c	2018-01-26 15:13:17.000000000 +0000
-+++ LVM2.2.02.177/tools/dmsetup.c	2018-01-26 15:22:40.528505198 +0000
-@@ -2572,6 +2572,93 @@ out:
+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 @@
  	return r;
  }
  
@@ -44,6 +16,7 @@ diff -urp LVM2.2.02.177.orig/tools/dmsetup.c LVM2.2.02.177/tools/dmsetup.c
 +	const char *name = NULL;
 +	const char *uuid = NULL;
 +	struct dm_info info;
++	struct dm_deps *deps;
 +
 +	if (names)
 +		name = names->name;
@@ -113,6 +86,28 @@ diff -urp LVM2.2.02.177.orig/tools/dmsetup.c LVM2.2.02.177/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)
@@ -123,7 +118,7 @@ diff -urp LVM2.2.02.177.orig/tools/dmsetup.c LVM2.2.02.177/tools/dmsetup.c
  /* Show target names and their version numbers */
  static int _targets(CMD_ARGS)
  {
-@@ -6247,6 +6334,7 @@ static struct command _dmsetup_commands[
+@@ -6272,6 +6382,7 @@
  	{"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},
@@ -131,3 +126,31 @@ diff -urp LVM2.2.02.177.orig/tools/dmsetup.c LVM2.2.02.177/tools/dmsetup.c
  	{"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 @@
+ .
+ .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 ]
+@@ -635,6 +643,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