diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2006-03-23 07:56:22 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2006-03-23 07:56:22 +0000 |
| commit | 83b6bd8ca01987d33c791bb609ad8a44dc893a51 (patch) | |
| tree | 5628b915f9df72c973baa6f848523b3f9da82f1d /x11-apps | |
| parent | Stable for x86. See bug #122727 (diff) | |
| download | gentoo-2-83b6bd8ca01987d33c791bb609ad8a44dc893a51.tar.gz gentoo-2-83b6bd8ca01987d33c791bb609ad8a44dc893a51.tar.bz2 gentoo-2-83b6bd8ca01987d33c791bb609ad8a44dc893a51.zip | |
(#118072) Don't choose twm over valid XSESSION setting when the session isn't in /etc/X11/Sessions/.
(Portage version: 2.1_pre6-r3)
Diffstat (limited to 'x11-apps')
| -rw-r--r-- | x11-apps/xinit/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-apps/xinit/files/chooser.sh | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog index 4108519ce5eb..d74f7ae2315d 100644 --- a/x11-apps/xinit/ChangeLog +++ b/x11-apps/xinit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-apps/xinit # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.37 2006/03/09 13:58:54 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.38 2006/03/23 07:56:22 spyderous Exp $ + + 23 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>; files/chooser.sh: + (#118072) Don't choose twm over valid XSESSION setting when the session + isn't in /etc/X11/Sessions/. 09 Mar 2006; Aron Griffis <agriffis@gentoo.org> xinit-1.0.1.ebuild: Mark 1.0.1 ~ia64 diff --git a/x11-apps/xinit/files/chooser.sh b/x11-apps/xinit/files/chooser.sh index 1f6de165c136..b8ef45cf43d0 100644 --- a/x11-apps/xinit/files/chooser.sh +++ b/x11-apps/xinit/files/chooser.sh @@ -2,7 +2,7 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 # Author: Martin Schlemmer <azarah@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/chooser.sh,v 1.2 2005/08/16 20:18:24 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/chooser.sh,v 1.3 2006/03/23 07:56:22 spyderous Exp $ # If $XSESSION is "", source first /etc/conf.d/basic, and then /etc/rc.conf if [ -z "${XSESSION}" ] @@ -52,9 +52,6 @@ if [ -n "${XSESSION}" ]; then break fi done - - # If all else fail, run twm - GENTOO_EXEC="/usr/bin/twm" fi fi |