diff options
Diffstat (limited to 'x11/gdm/files/patch-data_Xsession.in')
| -rw-r--r-- | x11/gdm/files/patch-data_Xsession.in | 46 |
1 files changed, 14 insertions, 32 deletions
diff --git a/x11/gdm/files/patch-data_Xsession.in b/x11/gdm/files/patch-data_Xsession.in index 894c97d1620c..9675cb2af95a 100644 --- a/x11/gdm/files/patch-data_Xsession.in +++ b/x11/gdm/files/patch-data_Xsession.in @@ -1,39 +1,21 @@ ---- data/Xsession.in.orig 2008-05-12 20:25:54.000000000 -0400 -+++ data/Xsession.in 2008-06-09 01:29:59.000000000 -0400 -@@ -231,12 +231,31 @@ if [ "x$command" = "xdefault" ] ; then +--- data/Xsession.in.orig 2014-05-08 18:53:58.000000000 +0200 ++++ data/Xsession.in 2014-05-08 18:54:21.000000000 +0200 +@@ -184,6 +184,10 @@ fi fi -+is_gnome=0 -+if [ "x$command" = "xgnome-session" ]; then -+ is_gnome=1 -+fi -+ -+# add seahorse-agent if found -+if [ ${is_gnome} = 1 ]; then -+ seahorseagent="`gdmwhich seahorse-agent`" -+ if [ -n "$seahorseagent" ] && [ -x "$seahorseagent" ] && [ -z "$GPG_AGENT_INFO" ] ; then -+ command="dbus-launch --exit-with-session $seahorseagent --execute $command" -+ elif [ -z "$seahorseagent" ] ; then -+ echo "$0: seahorse-agent not found!" -+ fi -+fi -+ ++# Do not start ssh-agent(1) in case we run gnome-session (gnome-keyring ++# already provides the functionality of an SSH agent), see: ++# https://bugzilla.redhat.com/show_bug.cgi?id=441123 ++if [ "x$command" != "xgnome-session" ]; then # 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!" -+# ssh-agent functionality is handled by gnome-keyring-daemon which is launched -+# from gnome-session -+if [ ${is_gnome} != 1 ]; then -+ 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 + sshagent="`gdmwhich ssh-agent`" + if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then +@@ -191,6 +195,7 @@ + elif [ -z "$sshagent" ] ; then + echo "$0: ssh-agent not found!" fi ++fi echo "$0: Setup done, will execute: $command" + |