summaryrefslogtreecommitdiff
blob: bfd8398af2b352f434340b59c9c11d2ea4717979 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
From c0581264d5e2b412aa27dc30623512b461024e4f Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <eva@gentoo.org>
Date: Tue, 2 Nov 2010 23:19:31 +0100
Subject: [PATCH 2/4] ssh-agent handling must be done at xinitrc.d

Gentoo bug: #220603
---
 data/Xsession.in | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/data/Xsession.in b/data/Xsession.in
index 201be92..88f1fd9 100755
--- a/data/Xsession.in
+++ b/data/Xsession.in
@@ -191,14 +191,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
     done
 fi
 
-# add ssh-agent if found
-sshagent="`gdmwhich ssh-agent`"
-if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
-    command="$sshagent -- $command"
-elif [ -z "$sshagent" ] ; then
-    echo "$0: ssh-agent not found!"
-fi
-
 echo "$0: Setup done, will execute: $command"
 
 eval exec $command
-- 
1.8.5.1