2008-11-21 17:43:02 +00:00
$OpenBSD: patch-config_Xsession_in,v 1.7 2008/11/21 17:43:02 jasper Exp $
--- config/Xsession.in.orig Tue Nov 18 22:52:07 2008
+++ config/Xsession.in Tue Nov 18 22:53:30 2008
@@ -225,7 +225,10 @@ if [ "x$command" = "xdefault" ] ; then
2007-05-18 17:20:39 +00:00
disptext=`gettextfunc "System has no Xclients file, so starting a failsafe xterm session. Windows will have focus only if the mouse pointer is above them. To get out of this mode type 'exit' in the window."`
"$zenity" --info --text "$disptext"
else
- echo "$0: Cannot find Xclients"
+ # Load the OpenBSD default Xsession...
+ command="/etc/X11/xdm/Xsession"
+ # hack around running two agents
+ NO_SSH=yes
fi
exec xterm -geometry 80x24+0+0
2003-10-08 15:57:01 +00:00
fi
2008-11-21 17:43:02 +00:00
@@ -233,7 +236,7 @@ fi
2003-10-08 15:57:01 +00:00
# add ssh-agent if found
2004-06-24 23:58:34 +00:00
sshagent="`gdmwhich ssh-agent`"
2003-10-08 15:57:01 +00: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!"
