diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2002-06-02 21:07:31 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2002-06-02 21:07:31 +0000 |
| commit | 36ec2b0b9c9f0448fd6829188be2fd21816f2e2f (patch) | |
| tree | 7e728286b4015affaeb4478e58b7143368951748 /x11-base | |
| parent | Uncommented some mozilla and related packages. (diff) | |
| download | gentoo-2-36ec2b0b9c9f0448fd6829188be2fd21816f2e2f.tar.gz gentoo-2-36ec2b0b9c9f0448fd6829188be2fd21816f2e2f.tar.bz2 gentoo-2-36ec2b0b9c9f0448fd6829188be2fd21816f2e2f.zip | |
bug #2731
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xfree/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-base/xfree/files/4.2.0-r11/Xsession | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index 43aee144ca9a..0672e03fccff 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,6 +1,6 @@ # ChangeLog for x11-base/xfree # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.21 2002/06/02 15:43:57 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.22 2002/06/02 21:07:31 azarah Exp $ *xfree-4.2.0-r11 (28 May 2002) @@ -9,6 +9,9 @@ Some more symlink cleanups. Dont nuke the host.def, just filter our hardcoded CFLAGS. + Fix /etc/X11/xdm/Xsession to first run ~/.xsession, rather then the system + default (bug #2731). + 30 May 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.0-r11.ebuild, xfs.start, xfs.conf.d, xfs.config : diff --git a/x11-base/xfree/files/4.2.0-r11/Xsession b/x11-base/xfree/files/4.2.0-r11/Xsession index e6dbe22479fd..1cc49d2f8914 100644 --- a/x11-base/xfree/files/4.2.0-r11/Xsession +++ b/x11-base/xfree/files/4.2.0-r11/Xsession @@ -43,14 +43,14 @@ if [ -f "$usermodmap" ]; then fi #xsession -if [ -n "`/etc/X11/chooser.sh`" ]; then - exec "`/etc/X11/chooser.sh`" -elif [ -s "$startup" ]; then +if [ -s "$startup" ]; then if [ -x "$startup" ]; then exec "$startup" else exec /bin/sh "$startup" fi +elif [ -n "`/etc/X11/chooser.sh`" ]; then + exec "`/etc/X11/chooser.sh`" else exec xsm fi |