X-Git-Url: https://git.tld-linux.org/?p=packages%2Flvm2.git;a=blobdiff_plain;f=device-mapper-dmsetup-export.patch;h=2aba64e52143d87ba93df66a800e5c90e508a502;hp=029e8fabf0688b5a275654afcc5b9cbe6abe7971;hb=HEAD;hpb=e2c8246fa43770f4fd2309faf6059388b618f400

diff --git a/device-mapper-dmsetup-export.patch b/device-mapper-dmsetup-export.patch
index 029e8fa..2aba64e 100644
--- 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 -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;
  }
  
@@ -47,6 +16,7 @@
 +	const char *name = NULL;
 +	const char *uuid = NULL;
 +	struct dm_info info;
++	struct dm_deps *deps;
 +
 +	if (names)
 +		name = names->name;
@@ -116,6 +86,28 @@
 +		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)
@@ -126,11 +118,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},
+@@ -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},
+ 	{"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