mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-12 15:36:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #486 from marineam/sdk

Browse Source 
enter_chroot: always bind $GNUPGHOME to the default path
This commit is contained in:
Michael Marineau 2015-12-01 14:44:35 -08:00
commit 37a2a0319a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sdk_lib/enter_chroot.sh
View File

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