Sync gpg-agent changes with origin/master.
This commit is contained in:
parent
44ad23f4f0
commit
353d2f0877
2 changed files with 4 additions and 1 deletions
|
|
@ -15,6 +15,9 @@ hash lesspipe >/dev/null 2>&1 && eval "$(SHELL=/bin/sh lesspipe)"
|
||||||
# Platform specific set up.
|
# Platform specific set up.
|
||||||
PLATFORM="$(uname -s)"
|
PLATFORM="$(uname -s)"
|
||||||
if [[ "$PLATFORM" = "Linux" ]]; then
|
if [[ "$PLATFORM" = "Linux" ]]; then
|
||||||
|
# This is a hack to work around a problem with elogind/pam not creating
|
||||||
|
# a gnupg directory under /run/user/0 for the gpg-agent socket.
|
||||||
|
(( $(id -u) == 0 )) && [[ -e "$HOME/.gnupg/S.gpg-agent" ]] && mkdir -m 700 /run/user/0/gnupg && ln -sf "$HOME/.gnupg/S.gpg-agent" /run/user/0/gnupg
|
||||||
export GPG_TTY="$(tty)" && gpg-connect-agent updatestartuptty /bye >/dev/null 2>&1
|
export GPG_TTY="$(tty)" && gpg-connect-agent updatestartuptty /bye >/dev/null 2>&1
|
||||||
export I_WANT_A_BROKEN_PS=1
|
export I_WANT_A_BROKEN_PS=1
|
||||||
export LYNX_CFG="$HOME/.lynx.cfg"
|
export LYNX_CFG="$HOME/.lynx.cfg"
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ Host phil lil tommy-wifi
|
||||||
|
|
||||||
Host full-* build-* clone-*
|
Host full-* build-* clone-*
|
||||||
ForwardAgent yes
|
ForwardAgent yes
|
||||||
RemoteForward /run/user/0/gnupg/S.gpg-agent ${HOME}/.gnupg/S.gpg-agent
|
RemoteForward /root/.gnupg/S.gpg-agent ${HOME}/.gnupg/S.gpg-agent
|
||||||
User root
|
User root
|
||||||
|
|
||||||
# GitHub.
|
# GitHub.
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue