- updated to 2.02.177, partial PLD merge

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

diff --git a/device-mapper-dmsetup-deps-export.patch b/device-mapper-dmsetup-deps-export.patch
index fbf59e359a57563c172efa688a282f24672d5ec5..9a8e021be441428db6b6ff0437707ceae0b0c70c 100644 (file)
--- a/device-mapper-dmsetup-deps-export.patch
+++ b/device-mapper-dmsetup-deps-export.patch
@@ -1,14 +1,7 @@
----
- tools/dmsetup.c |   23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
-
-Index: LVM2.2.02.98/tools/dmsetup.c
-===================================================================
---- LVM2.2.02.98.orig/tools/dmsetup.c
-+++ LVM2.2.02.98/tools/dmsetup.c
-@@ -1717,10 +1717,11 @@ static int _export(CMD_ARGS)
-       char *target_type = NULL;
-       char *params;
+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:22:40.000000000 +0000
++++ LVM2.2.02.177/tools/dmsetup.c      2018-01-26 16:41:10.574224457 +0000
+@@ -2583,6 +2583,7 @@ static int _export(CMD_ARGS)
        const char *name = NULL;
        const char *uuid = NULL;
        struct dm_info info;
@@ -16,11 +9,7 @@ Index: LVM2.2.02.98/tools/dmsetup.c
  
        if (names)
                name = names->name;
-       else if (argc == 2)
-               name = argv[1];
-@@ -1786,10 +1787,32 @@ static int _export(CMD_ARGS)
-                               printf(",%s", target_type);
-               }
+@@ -2652,6 +2653,28 @@ static int _export(CMD_ARGS)
                printf("\n");
        }
  
@@ -49,5 +38,3 @@ Index: LVM2.2.02.98/tools/dmsetup.c
        r = 1;
        out:
        if (dmt)
-               dm_task_destroy(dmt);
-       return r;