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

- Start ssh-agent for startx also (#169259).

Browse Source
This commit is contained in:
Kristian Høgsberg 2006-08-18 02:03:23 +00:00
parent a8933c141e
commit 8079f98009
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xinitrc
View File

@ -18,11 +18,11 @@
# 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 $DBUS_LAUNCH $HOME/.Xclients || \ exec $SSH_AGENT $DBUS_LAUNCH $HOME/.Xclients || \
exec $HOME/.Xclients exec $SSH_AGENT $HOME/.Xclients
elif [ -f /etc/X11/xinit/Xclients ]; then elif [ -f /etc/X11/xinit/Xclients ]; then
exec $DBUS_LAUNCH /etc/X11/xinit/Xclients || \ exec $SSH_AGENT $DBUS_LAUNCH /etc/X11/xinit/Xclients || \
exec /etc/X11/xinit/Xclients exec $SSH_AGENT /etc/X11/xinit/Xclients
else else
# Failsafe settings. Although we should never get here # Failsafe settings. Although we should never get here
# (we provide fallbacks in Xclients as well) it can't hurt. # (we provide fallbacks in Xclients as well) it can't hurt.

5
xorg-x11-xinit.spec
View File

@ -4,7 +4,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: %{xinitver} Version: %{xinitver}
Release: 8%{?dist} Release: 9%{?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
@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/xinit.1x* %{_mandir}/man1/xinit.1x*
%changelog %changelog
* Thu Aug 17 2006 Kristian Høgsberg <krh@redhat.com> - 1.0.2-9.fc6
- Start ssh-agent for startx also (#169259).
* Sat Jul 22 2006 Adam Jackson <ajackson@redhat.com> 1.0.2-8.fc6 * Sat Jul 22 2006 Adam Jackson <ajackson@redhat.com> 1.0.2-8.fc6
- Fix SourceN line for localuser.sh to not collide. - Fix SourceN line for localuser.sh to not collide.