From ec588134962aaabdb02e95fc1ef38c82ddb1ddfb Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Tue, 1 Dec 2015 14:34:43 -0800
Subject: [PATCH] enter_chroot: always bind $GNUPGHOME to the default path

The path of $GNUPGHOME outside the chroot may not really make sense
inside the chroot. Although that's probably not a big deal there's no
need to keep the outside value. Instead just bind it to the usual spot.
---
 sdk_lib/enter_chroot.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sdk_lib/enter_chroot.sh b/sdk_lib/enter_chroot.sh
index 7d28b15e70..2434960e05 100755
--- a/sdk_lib/enter_chroot.sh
+++ b/sdk_lib/enter_chroot.sh
@@ -296,7 +296,7 @@ setup_env() {
     : ${GNUPGHOME:="$SUDO_HOME/.gnupg"}
     if [[ -d "${GNUPGHOME}" ]]; then
       debug "Mounting GnuPG"
-      setup_mount "${GNUPGHOME}" "--bind" "${GNUPGHOME}"
+      setup_mount "${GNUPGHOME}" "--bind" "/home/${SUDO_USER}/.gnupg"
 
       # bind mount the gpg agent dir if available
       GPG_AGENT_DIR="${GPG_AGENT_INFO%/*}"
@@ -304,6 +304,7 @@ setup_env() {
         setup_mount "$GPG_AGENT_DIR" "--bind" "$GPG_AGENT_DIR"
       fi
     fi
+    unset GNUPGHOME
 
     # Mount additional directories as specified in .local_mounts file.
     local local_mounts="${FLAGS_trunk}/src/scripts/.local_mounts"