The following pull request was submitted through Github. It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/3584
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) === We have implemented the requested changes in #1507.
From f7c2c9e4e3cbcdcda8728f296507c0d1d0b3471d Mon Sep 17 00:00:00 2001 From: Andrew Deng <adeng1...@gmail.com> Date: Thu, 19 Nov 2020 21:32:22 -0600 Subject: [PATCH 1/2] test commit Signed-off-by: Andrew Deng <adeng1...@gmail.com> --- src/lxc/af_unix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/af_unix.c b/src/lxc/af_unix.c index bd29b09da0..1759e81de4 100644 --- a/src/lxc/af_unix.c +++ b/src/lxc/af_unix.c @@ -4,7 +4,7 @@ #define _GNU_SOURCE 1 #endif #include <errno.h> -#include <fcntl.h> +#include <fcntl.h> #include <stddef.h> #include <stdio.h> #include <stdlib.h> From 435b06260fd1facf49245d1e5c9f98d9164fdebc Mon Sep 17 00:00:00 2001 From: Andrew Deng <adeng1...@gmail.com> Date: Fri, 20 Nov 2020 19:35:22 -0600 Subject: [PATCH 2/2] implemented changes requested for 1507 Signed-off-by: Andrew Deng <adeng1...@gmail.com> --- templates/lxc-download.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/lxc-download.in b/templates/lxc-download.in index 278487d22c..39fafc2358 100644 --- a/templates/lxc-download.in +++ b/templates/lxc-download.in @@ -130,6 +130,10 @@ gpg_setup() { mkdir -p "${DOWNLOAD_TEMP}/gpg" chmod 700 "${DOWNLOAD_TEMP}/gpg" + + if [ -z "${STANDARD_RESOLVER:-}" ]; then + echo "standard-resolver" > "${DOWNLOAD_TEMP}/gpg/dirmngr.conf" + fi export GNUPGHOME="${DOWNLOAD_TEMP}/gpg" success=
_______________________________________________ lxc-devel mailing list lxc-devel@lists.linuxcontainers.org http://lists.linuxcontainers.org/listinfo/lxc-devel