rpms/xorg-x11-xinit/devel Xsession,1.6,1.7
Peter Jones (pjones)
fedora-extras-commits at redhat.com
Tue Oct 23 18:33:49 UTC 2007
Author: pjones
Update of /cvs/extras/rpms/xorg-x11-xinit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2060
Modified Files:
Xsession
Log Message:
- add CK_XINIT_SESSION calls.
Index: Xsession
===================================================================
RCS file: /cvs/extras/rpms/xorg-x11-xinit/devel/Xsession,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Xsession 6 Aug 2007 17:39:58 -0000 1.6
+++ Xsession 23 Oct 2007 18:33:14 -0000 1.7
@@ -40,13 +40,13 @@
# this script.
XCLIENTS_D=/etc/X11/xinit/Xclients.d
if [ -d "$XCLIENTS_D" -a "$#" -eq 1 -a -x "$XCLIENTS_D/Xclients.$1.sh" ]; then
- exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $XCLIENTS_D/Xclients.$1.sh"
+ exec -l $SHELL -c "$CK_XINIT_SESSION $SSH_AGENT $DBUS_LAUNCH $XCLIENTS_D/Xclients.$1.sh"
else
# now, we see if xdm/gdm/kdm has asked for a specific environment
case $# in
1)
if [ -x "$SWITCHDESKPATH/Xclients.$1" ]; then
- exec -l $SHELL -c "$SWITCHDESKPATH/Xclients.$1";
+ exec -l $SHELL -c "$CK_XINIT_SESSION $SWITCHDESKPATH/Xclients.$1";
fi;
case "$1" in
@@ -54,11 +54,11 @@
exec -l $SHELL -c "xterm -geometry 80x24-0-0"
;;
gnome)
- exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH gnome-session"
- exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH gnome-session\""
+ exec -l $SHELL -c "$CK_XINIT_SESSION $SSH_AGENT $DBUS_LAUNCH gnome-session"
+ exec $CK_XINIT_SESSION $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH gnome-session\""
;;
kde|kde1|kde2)
- exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH startkde\""
+ exec $CK_XINIT_SESSION $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH startkde\""
;;
twm)
# fall back to twm
@@ -78,11 +78,11 @@
# otherwise, take default action
if [ -x "$HOME/.xsession" ]; then
- exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $HOME/.xsession"
+ exec -l $SHELL -c "$CK_XINIT_SESSION $SSH_AGENT $DBUS_LAUNCH $HOME/.xsession"
elif [ -x "$HOME/.Xclients" ]; then
- exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $HOME/.Xclients"
+ exec -l $SHELL -c "$CK_XINIT_SESSION $SSH_AGENT $DBUS_LAUNCH $HOME/.Xclients"
elif [ -x /etc/X11/xinit/Xclients ]; then
- exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH /etc/X11/xinit/Xclients"
+ exec -l $SHELL -c "$CK_XINIT_SESSION $SSH_AGENT $DBUS_LAUNCH /etc/X11/xinit/Xclients"
else
# should never get here; failsafe fallback
exec -l $SHELL -c "xsm"
More information about the fedora-extras-commits
mailing list