- don't special case dbus-launch. dbus-x11 now installs a script into
/etc/X11/xinit/xinitrc.d.
- Drop the weird grep rule for extensions ending in .sh when sourcing
/etc/X11/xinit/xinitrc.d
This commit is contained in:
Ray Strode
parent
f676551bdf
commit
afece66c47
18
Xsession
18
Xsession
@ -40,7 +40,7 @@ SWITCHDESKPATH=/usr/share/switchdesk
|
||||
# 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 "$SSH_AGENT $XCLIENTS_D/Xclients.$1.sh"
|
||||
else
|
||||
# now, we see if xdm/gdm/kdm has asked for a specific environment
|
||||
case $# in
|
||||
@ -54,22 +54,22 @@ case $# in
|
||||
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 "$SSH_AGENT gnome-session"
|
||||
exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"gnome-session\""
|
||||
;;
|
||||
kde|kde1|kde2)
|
||||
exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH startkde\""
|
||||
exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"startkde\""
|
||||
;;
|
||||
twm)
|
||||
# fall back to twm
|
||||
exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"DBUS_LAUNCH twm\""
|
||||
exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"twm\""
|
||||
;;
|
||||
*)
|
||||
# GDM provies either a command line as the first argument or
|
||||
# provides 'failsafe', 'default' or 'custom'. KDM will do the
|
||||
# same at some point
|
||||
if [ "$1" != "default" -a "$1" != "custom" ]; then
|
||||
exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH $1\""
|
||||
exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$1\""
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
@ -78,11 +78,11 @@ fi
|
||||
|
||||
# otherwise, take default action
|
||||
if [ -x "$HOME/.xsession" ]; then
|
||||
exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $HOME/.xsession"
|
||||
exec -l $SHELL -c "$SSH_AGENT $HOME/.xsession"
|
||||
elif [ -x "$HOME/.Xclients" ]; then
|
||||
exec -l $SHELL -c "$SSH_AGENT $DBUS_LAUNCH $HOME/.Xclients"
|
||||
exec -l $SHELL -c "$SSH_AGENT $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 "$SSH_AGENT /etc/X11/xinit/Xclients"
|
||||
else
|
||||
# should never get here; failsafe fallback
|
||||
exec -l $SHELL -c "xsm"
|
||||
|
||||
4
xinitrc
4
xinitrc
@ -18,10 +18,10 @@
|
||||
# The user may have their own clients they want to run. If they don't,
|
||||
# fall back to system defaults.
|
||||
if [ -f $HOME/.Xclients ]; then
|
||||
exec $CK_XINIT_SESSION $SSH_AGENT $DBUS_LAUNCH $HOME/.Xclients || \
|
||||
exec $CK_XINIT_SESSION $SSH_AGENT $HOME/.Xclients || \
|
||||
exec $CK_XINIT_SESSION $SSH_AGENT $HOME/.Xclients
|
||||
elif [ -f /etc/X11/xinit/Xclients ]; then
|
||||
exec $CK_XINIT_SESSION $SSH_AGENT $DBUS_LAUNCH /etc/X11/xinit/Xclients || \
|
||||
exec $CK_XINIT_SESSION $SSH_AGENT /etc/X11/xinit/Xclients || \
|
||||
exec $CK_XINIT_SESSION $SSH_AGENT /etc/X11/xinit/Xclients
|
||||
else
|
||||
# Failsafe settings. Although we should never get here
|
||||
|
||||
@ -51,11 +51,7 @@ unset XKB_IN_USE
|
||||
|
||||
# run all system xinitrc shell scripts.
|
||||
for file in /etc/X11/xinit/xinitrc.d/* ; do
|
||||
if echo $file | grep -q "\.sh$" ; then
|
||||
. $file
|
||||
else
|
||||
echo "warning: $file does not end in .sh extension, ignoring"
|
||||
fi
|
||||
done
|
||||
|
||||
# Prefix launch of session with ssh-agent if available and not already running.
|
||||
@ -68,8 +64,5 @@ if [ -x /usr/bin/ssh-agent -a -z "$SSH_AGENT_PID" ]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
DBUS_LAUNCH=
|
||||
[ -x /usr/bin/dbus-launch -a -z "$DBUS_SESSION_BUS_ADDRESS" ] && DBUS_LAUNCH="/usr/bin/dbus-launch --exit-with-session"
|
||||
|
||||
CK_XINIT_SESSION=
|
||||
[ -x /usr/bin/ck-xinit-session ] && CK_XINIT_SESSION="/usr/bin/ck-xinit-session"
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
Summary: X.Org X11 X Window System xinit startup scripts
|
||||
Name: xorg-x11-%{pkgname}
|
||||
Version: 1.0.7
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
License: MIT/X11
|
||||
Group: User Interface/X
|
||||
URL: http://www.x.org
|
||||
@ -49,6 +49,11 @@ Obsoletes: XFree86, xorg-x11
|
||||
# to the xdm package.
|
||||
Obsoletes: xinitrc
|
||||
|
||||
# We don't explicitly run dbus-launch anymore. We depend on a dbus new enough
|
||||
# that it installs its own .sh file in xinitrc.d to launch itself at session
|
||||
# startup.
|
||||
Conflicts: dbus < 1.1.4-3.fc9
|
||||
|
||||
%description
|
||||
X.Org X11 X Window System xinit startup scripts
|
||||
|
||||
@ -115,6 +120,12 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_mandir}/man1/xinit.1*
|
||||
|
||||
%changelog
|
||||
* Mon Feb 4 2008 Ray Strode <rstrode@redhat.com> 1.0.7-3
|
||||
- don't special case dbus-launch. dbus-x11 now installs
|
||||
a script into /etc/X11/xinit/xinitrc.d.
|
||||
- Drop the weird grep rule for extensions ending in .sh
|
||||
when sourcing /etc/X11/xinit/xinitrc.d
|
||||
|
||||
* Fri Oct 12 2007 Nalin Dahyabhai <nalin@redhat.com> 1.0.7-2
|
||||
- Try opening the console-kit session after the user's UID has already
|
||||
been granted access to the server by localuser.sh, so that console-kit-daemon
|
||||
|
||||
Loading…
Reference in New Issue
Block a user