From 959a818ea43c23dc2638b665d66f2ff2a6a6b5fe Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Mon, 10 Jul 2023 11:30:54 +0200 Subject: [PATCH] - merged into single patch --- device-mapper-dmsetup-deps-export.patch | 40 ----------------------- device-mapper-dmsetup-export.patch | 43 +++++++++++++++++++------ 2 files changed, 33 insertions(+), 50 deletions(-) delete mode 100644 device-mapper-dmsetup-deps-export.patch diff --git a/device-mapper-dmsetup-deps-export.patch b/device-mapper-dmsetup-deps-export.patch deleted file mode 100644 index bace4d3..0000000 --- a/device-mapper-dmsetup-deps-export.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -ur LVM2.2.03.02.orig/libdm/dm-tools/dmsetup.c LVM2.2.03.02/libdm/dm-tools/dmsetup.c ---- LVM2.2.03.02.orig/libdm/dm-tools/dmsetup.c 2019-03-22 17:08:18.345000000 +0100 -+++ LVM2.2.03.02/libdm/dm-tools/dmsetup.c 2019-03-22 17:09:27.125000000 +0100 -@@ -2562,6 +2562,7 @@ - const char *name = NULL; - const char *uuid = NULL; - struct dm_info info; -+ struct dm_deps *deps; - - if (names) - name = names->name; -@@ -2631,6 +2632,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) diff --git a/device-mapper-dmsetup-export.patch b/device-mapper-dmsetup-export.patch index ef21a68..37d8d46 100644 --- a/device-mapper-dmsetup-export.patch +++ b/device-mapper-dmsetup-export.patch @@ -1,7 +1,7 @@ -diff -ur LVM2.2.03.02.orig/libdm/dm-tools/dmsetup.c LVM2.2.03.02/libdm/dm-tools/dmsetup.c ---- LVM2.2.03.02.orig/libdm/dm-tools/dmsetup.c 2019-03-22 16:55:55.393000000 +0100 -+++ LVM2.2.03.02/libdm/dm-tools/dmsetup.c 2019-03-22 17:00:55.046000000 +0100 -@@ -2551,6 +2551,93 @@ +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; } @@ -16,6 +16,7 @@ diff -ur LVM2.2.03.02.orig/libdm/dm-tools/dmsetup.c LVM2.2.03.02/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 -ur LVM2.2.03.02.orig/libdm/dm-tools/dmsetup.c LVM2.2.03.02/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 -ur LVM2.2.03.02.orig/libdm/dm-tools/dmsetup.c LVM2.2.03.02/libdm/dm-tools/ /* Show target names and their version numbers */ static int _targets(CMD_ARGS) { -@@ -6230,6 +6317,7 @@ +@@ -6272,6 +6382,7 @@ {"stats", " [] [...]", 1, -1, 1, 1, _stats}, {"status", "[...] [--noflush] [--target ]", 0, -1, 2, 0, _status}, {"table", "[...] [--concise] [--target ] [--showkeys]", 0, -1, 2, 0, _status}, @@ -103,10 +126,10 @@ diff -ur LVM2.2.03.02.orig/libdm/dm-tools/dmsetup.c LVM2.2.03.02/libdm/dm-tools/ {"wait", " [] [--noflush]", 0, 2, 0, 0, _wait}, {"mknodes", "[...]", 0, -1, 1, 0, _mknodes}, {"mangle", "[...]", 0, -1, 1, 0, _mangle}, -diff -ur LVM2.2.03.02.orig/man/dmsetup.8_main LVM2.2.03.02/man/dmsetup.8_main ---- LVM2.2.03.02.orig/man/dmsetup.8_main 2019-03-22 16:55:55.394000000 +0100 -+++ LVM2.2.03.02/man/dmsetup.8_main 2019-03-22 17:00:55.047000000 +0100 -@@ -59,6 +59,14 @@ +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 @@ -121,7 +144,7 @@ diff -ur LVM2.2.03.02.orig/man/dmsetup.8_main LVM2.2.03.02/man/dmsetup.8_main .de CMD_HELP . BR help . RB [ -c | -C | --columns ] -@@ -651,6 +659,9 @@ +@@ -635,6 +643,9 @@ \fBdevname\fP (map name for device-mapper devices, equal to blkdevname otherwise). . .HP -- 2.44.0