rpms/xorg-x11-xinit
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix bug 164869

Browse Source
This commit is contained in:
Soren Sandmann Pedersen 2007-07-29 23:09:50 +00:00
parent 94e5ee4364
commit 00772e3779
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Xsession
View File

@ -50,27 +50,28 @@ case $# in
fi; fi;
case "$1" in case "$1" in
failsafe) failsafe)
exec -l $SHELL -c "xterm -geometry 80x24-0-0" exec -l $SHELL -c "xterm -geometry 80x24-0-0"
;; ;;
gnome) gnome)
exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH gnome-session" exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH gnome-session"
;; exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH gnome-session\""
kde|kde1|kde2) ;;
exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH startkde" kde|kde1|kde2)
;; exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH startkde\""
twm) ;;
twm)
# fall back to twm # fall back to twm
exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH twm" exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"DBUS_LAUNCH twm\""
;; ;;
*) *)
# GDM provies either a command line as the first argument or # GDM provies either a command line as the first argument or
# provides 'failsafe', 'default' or 'custom'. KDM will do the # provides 'failsafe', 'default' or 'custom'. KDM will do the
# same at some point # same at some point
if [ "$1" != "default" -a "$1" != "custom" ]; then if [ "$1" != "default" -a "$1" != "custom" ]; then
exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $1" exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH $1\""
fi fi
;; ;;
esac esac
esac esac
fi fi

5
xorg-x11-xinit.spec
View File

@ -110,6 +110,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/xinit.1* %{_mandir}/man1/xinit.1*
%changelog %changelog
* Sun Jul 29 2007 Soren Sandmann <sandmann@redhat.com> 1.0.2-23
- Fix Xsession to run the login shell inside the setgid ssh-agent, rather
than the other way around. This preserves LD_LIBRARY_PRELOAD.
Patch from Stefan Becker, bug 164869.
* Fri Jul 27 2007 Soren Sandmann <sandmann@redhat.com> 1.0.2-22 * Fri Jul 27 2007 Soren Sandmann <sandmann@redhat.com> 1.0.2-22
- Remove xinput.sh. Bug 244963. - Remove xinput.sh. Bug 244963.