The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/3283
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
From a8a33bf987b9fccce1ecf0dc47e968f702856ed5 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brau...@ubuntu.com>
Date: Tue, 10 Mar 2020 16:23:11 +0100
Subject: [PATCH 1/2] tests/share_ns: always call pthread_exit()
Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
---
src/tests/share_ns.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/tests/share_ns.c b/src/tests/share_ns.c
index f020904f5f..bafe5310e9 100644
--- a/src/tests/share_ns.c
+++ b/src/tests/share_ns.c
@@ -56,7 +56,7 @@ void *ns_sharing_wrapper(void *data)
c = lxc_container_new(name, NULL);
if (!c) {
lxc_error("Failed to create container \"%s\"\n", name);
- return NULL;
+ goto out_pthread_exit;
}
if (c->is_defined(c)) {
@@ -168,6 +168,7 @@ void *ns_sharing_wrapper(void *data)
if (!c->destroy(c))
lxc_error("Failed to destroy container \"%s\"\n", name);
+out_pthread_exit:
pthread_exit(NULL);
return NULL;
}
From 8fa19c14f19f5dc7a0af1f1bc60dd826fe9d99e4 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brau...@ubuntu.com>
Date: Tue, 10 Mar 2020 16:23:27 +0100
Subject: [PATCH 2/2] file_utils: include stdio.h for fmemopen()
Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
---
src/lxc/file_utils.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/lxc/file_utils.c b/src/lxc/file_utils.c
index 687a4a7e9a..56c3552b9b 100644
--- a/src/lxc/file_utils.c
+++ b/src/lxc/file_utils.c
@@ -6,6 +6,7 @@
#include <errno.h>
#include <fcntl.h>
#include <linux/magic.h>
+#include <stdio.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <sys/sendfile.h>
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
