[lxc-devel] [lxc/master] Issue 1507

[AndrewElvisDeng on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 353 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20201120/2c9375d1/attachment.bin>
-------------- next part --------------
From f7c2c9e4e3cbcdcda8728f296507c0d1d0b3471d Mon Sep 17 00:00:00 2001
From: Andrew Deng <adeng1433 at gmail.com>
Date: Thu, 19 Nov 2020 21:32:22 -0600
Subject: [PATCH 1/2] test commit

Signed-off-by: Andrew Deng <adeng1433 at 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 <adeng1433 at 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 <adeng1433 at 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=