|
3.1.2
by Yves-Alexis Perez
* debian/{postinst,prerm} dropped, we don't install any mcs plugin anyway. |
1 |
diff --git a/scripts/xinitrc.in b/scripts/xinitrc.in
|
2 |
index 1a00294..b99fb8e 100755
|
|
|
46
by Cody A.W. Somerville
* Updated following patches to patch scripts/xinitrc.in.in instead of |
3 |
--- a/scripts/xinitrc.in.in
|
4 |
+++ b/scripts/xinitrc.in.in
|
|
|
3.1.2
by Yves-Alexis Perez
* debian/{postinst,prerm} dropped, we don't install any mcs plugin anyway. |
5 |
@@ -64,12 +64,15 @@ fi
|
6 |
||
7 |
# Use ssh-agent if installed and not already running. Run it separately |
|
8 |
# so it populates the environment here, so we can clean it up later. |
|
9 |
+# Don't use ssh-agent if it has been disabled in Xsession.options
|
|
10 |
+if grep -qs ^use-ssh-agent "/etc/X11/Xsession.options"; then
|
|
11 |
sshagent=`which ssh-agent` |
|
12 |
kill_sshagent=0 |
|
13 |
if test -z "$SSH_AGENT_PID" -a "$sshagent" -a "x$sshagent" != "xno"; then |
|
14 |
eval `$sshagent -s` |
|
15 |
kill_sshagent=1 |
|
16 |
fi |
|
17 |
+fi
|
|
18 |
||
19 |
# Use dbus-launch if installed. |
|
20 |
if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then |