From: Simon Ruderich Date: Wed, 11 Sep 2013 11:42:03 +0000 (+0200) Subject: xinitrc: Only start ssh-agent if none is running yet. X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=e89a436e7bf6077e8372420a6134f497c4c25ebc;p=config%2Fdotfiles.git xinitrc: Only start ssh-agent if none is running yet. --- diff --git a/xinitrc b/xinitrc index e9d81ad..2294e31 100755 --- a/xinitrc +++ b/xinitrc @@ -74,9 +74,11 @@ if test -f "$HOME/.xinitrc.local"; then fi -# Start ssh-agent if we have private keys, thanks to +# Start ssh-agent if no agent is running and we have private keys, thanks to # http://code.haskell.org/XMonadContrib/scripts/xinitrc (read on 2011-06-19). -if test -x /usr/bin/ssh-agent && test -f "$HOME/.ssh/id_rsa"; then +if test -z "$SSH_AGENT_PID" \ + && test -x /usr/bin/ssh-agent \ + && test -f "$HOME/.ssh/id_rsa"; then # -s to force bourne shell output. This file is a bourne shell script even # if the environment might suggest otherwise. eval `/usr/bin/ssh-agent -s` >/dev/null