2005-05-25 23:39:30 -04:00
|
|
|
$OpenBSD: patch-config_Xsession_in,v 1.4 2005/05/26 03:39:31 marcm Exp $
|
|
|
|
|
--- config/Xsession.in.orig Thu Feb 3 14:57:45 2005
|
|
|
|
|
+++ config/Xsession.in Wed May 18 21:04:10 2005
|
|
|
|
|
@@ -218,15 +218,16 @@ if [ "x$command" = "xdefault" ] ; then
|
2003-10-08 11:57:01 -04:00
|
|
|
elif [ -x /etc/X11/Xclients ]; then
|
|
|
|
|
command="/etc/X11/Xclients"
|
|
|
|
|
else
|
|
|
|
|
- echo "$0: Cannot find Xclients"
|
|
|
|
|
- # FIXME: kind of an evil failsafe
|
|
|
|
|
- command="xsm"
|
|
|
|
|
+ # Load the OpenBSD default Xsession...
|
|
|
|
|
+ command="/etc/X11/xdm/Xsession"
|
|
|
|
|
+ # hack around running two agents
|
|
|
|
|
+ NO_SSH=yes
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# add ssh-agent if found
|
2004-06-24 19:58:34 -04:00
|
|
|
sshagent="`gdmwhich ssh-agent`"
|
2003-10-08 11:57:01 -04:00
|
|
|
-if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
|
|
|
|
|
+if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ] && [ -z "$NO_SSH" ]; then
|
|
|
|
|
command="$sshagent -- $command"
|
|
|
|
|
elif [ -z "$sshagent" ] ; then
|
|
|
|
|
echo "$0: ssh-agent not found!"
|
