1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
|
diff --git a/scripts/xinitrc.in b/scripts/xinitrc.in
index 1a00294..b99fb8e 100755
--- a/scripts/xinitrc.in.in
+++ b/scripts/xinitrc.in.in
@@ -64,12 +64,15 @@ fi
# Use ssh-agent if installed and not already running. Run it separately
# so it populates the environment here, so we can clean it up later.
+# Don't use ssh-agent if it has been disabled in Xsession.options
+if grep -qs ^use-ssh-agent "/etc/X11/Xsession.options"; then
sshagent=`which ssh-agent`
kill_sshagent=0
if test -z "$SSH_AGENT_PID" -a "$sshagent" -a "x$sshagent" != "xno"; then
eval `$sshagent -s`
kill_sshagent=1
fi
+fi
# Use dbus-launch if installed.
if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then
|