- 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 2008-02-04 18:49:27 +00:00
parent f676551bdf
commit afece66c47
4 changed files with 23 additions and 19 deletions

View File

@ -40,7 +40,7 @@ SWITCHDESKPATH=/usr/share/switchdesk
# this script. # this script.
XCLIENTS_D=/etc/X11/xinit/Xclients.d XCLIENTS_D=/etc/X11/xinit/Xclients.d
if [ -d "$XCLIENTS_D" -a "$#" -eq 1 -a -x "$XCLIENTS_D/Xclients.$1.sh" ]; then 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 else
# now, we see if xdm/gdm/kdm has asked for a specific environment # now, we see if xdm/gdm/kdm has asked for a specific environment
case $# in case $# in
@ -54,22 +54,22 @@ case $# in
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 gnome-session"
exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH gnome-session\"" exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"gnome-session\""
;; ;;
kde|kde1|kde2) 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) twm)
# fall back to 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 # 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 $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$DBUS_LAUNCH $1\"" exec $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$1\""
fi fi
;; ;;
esac esac
@ -78,11 +78,11 @@ fi
# otherwise, take default action # otherwise, take default action
if [ -x "$HOME/.xsession" ]; then 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 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 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 else
# should never get here; failsafe fallback # should never get here; failsafe fallback
exec -l $SHELL -c "xsm" exec -l $SHELL -c "xsm"

View File

@ -18,10 +18,10 @@
# The user may have their own clients they want to run. If they don't, # The user may have their own clients they want to run. If they don't,
# fall back to system defaults. # fall back to system defaults.
if [ -f $HOME/.Xclients ]; then 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 exec $CK_XINIT_SESSION $SSH_AGENT $HOME/.Xclients
elif [ -f /etc/X11/xinit/Xclients ]; then 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 exec $CK_XINIT_SESSION $SSH_AGENT /etc/X11/xinit/Xclients
else else
# Failsafe settings. Although we should never get here # Failsafe settings. Although we should never get here

View File

@ -51,11 +51,7 @@ unset XKB_IN_USE
# run all system xinitrc shell scripts. # run all system xinitrc shell scripts.
for file in /etc/X11/xinit/xinitrc.d/* ; do for file in /etc/X11/xinit/xinitrc.d/* ; do
if echo $file | grep -q "\.sh$" ; then
. $file . $file
else
echo "warning: $file does not end in .sh extension, ignoring"
fi
done done
# Prefix launch of session with ssh-agent if available and not already running. # 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
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= CK_XINIT_SESSION=
[ -x /usr/bin/ck-xinit-session ] && CK_XINIT_SESSION="/usr/bin/ck-xinit-session" [ -x /usr/bin/ck-xinit-session ] && CK_XINIT_SESSION="/usr/bin/ck-xinit-session"

View File

@ -3,7 +3,7 @@
Summary: X.Org X11 X Window System xinit startup scripts Summary: X.Org X11 X Window System xinit startup scripts
Name: xorg-x11-%{pkgname} Name: xorg-x11-%{pkgname}
Version: 1.0.7 Version: 1.0.7
Release: 2%{?dist} Release: 3%{?dist}
License: MIT/X11 License: MIT/X11
Group: User Interface/X Group: User Interface/X
URL: http://www.x.org URL: http://www.x.org
@ -49,6 +49,11 @@ Obsoletes: XFree86, xorg-x11
# to the xdm package. # to the xdm package.
Obsoletes: xinitrc 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 %description
X.Org X11 X Window System xinit startup scripts X.Org X11 X Window System xinit startup scripts
@ -115,6 +120,12 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/xinit.1* %{_mandir}/man1/xinit.1*
%changelog %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 * 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 - 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 been granted access to the server by localuser.sh, so that console-kit-daemon