xinitrc: Only start ssh-agent if none is running yet.

diff --git a/xinitrc b/xinitrc
index e9d81ad3eee9d9465be76ac16af2660d66eeacf6..2294e31a7ca154c27ded521928856448c9641ab3 100755 (executable)
--- 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