diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2002-03-01 23:08:12 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2002-03-01 23:08:12 +0000 |
| commit | e1cd05fbc04ad66da368f9274b6215ced8d3baf7 (patch) | |
| tree | 99fada4f530b218fb7a589dda818b9bb1fc89807 /x11-base/xfree | |
| parent | new revision, removed old one (diff) | |
| download | gentoo-2-e1cd05fbc04ad66da368f9274b6215ced8d3baf7.tar.gz gentoo-2-e1cd05fbc04ad66da368f9274b6215ced8d3baf7.tar.bz2 gentoo-2-e1cd05fbc04ad66da368f9274b6215ced8d3baf7.zip | |
fix chooser.sh not sourcing the config files
Diffstat (limited to 'x11-base/xfree')
| -rw-r--r-- | x11-base/xfree/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xfree/files/4.2.0-r5/chooser.sh | 9 | ||||
| -rw-r--r-- | x11-base/xfree/files/4.2.0-r6/chooser.sh | 9 |
3 files changed, 21 insertions, 3 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index 5354d1e6fc24..5b889acfbaef 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,6 +1,10 @@ # 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.2 2002/02/23 15:47:34 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.3 2002/03/01 23:08:12 azarah Exp $ + + 28 Feb 2002; M.Schlemmer <azarah@gentoo.org> ${FILESDIR}/chooser.sh : + + Actually source /etc/conf.d/basic and /etc/rc.conf. *xfree-4.2.0-r6 (24 Feb 2002) diff --git a/x11-base/xfree/files/4.2.0-r5/chooser.sh b/x11-base/xfree/files/4.2.0-r5/chooser.sh index cc78b00b85a5..9460e8ab1742 100644 --- a/x11-base/xfree/files/4.2.0-r5/chooser.sh +++ b/x11-base/xfree/files/4.2.0-r5/chooser.sh @@ -1,7 +1,14 @@ #!/bin/sh # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r5/chooser.sh,v 1.1 2002/01/27 09:19:53 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r5/chooser.sh,v 1.2 2002/03/01 23:08:12 azarah Exp $ + +#if $XSESSION is "", source first /etc/conf.d/basic, and then /etc/rc.conf +if [ -z "$XSESSION" ] +then + [ -f /etc/conf.d/basic ] && source /etc/conf.d/basic + [ -f /etc/rc.conf ] && source /etc/rc.conf +fi #find a match for $XSESSION in /etc/X11/Sessions GENTOO_SESSION="" diff --git a/x11-base/xfree/files/4.2.0-r6/chooser.sh b/x11-base/xfree/files/4.2.0-r6/chooser.sh index 37e4c224492f..40684438eaa6 100644 --- a/x11-base/xfree/files/4.2.0-r6/chooser.sh +++ b/x11-base/xfree/files/4.2.0-r6/chooser.sh @@ -1,7 +1,14 @@ #!/bin/sh # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r6/chooser.sh,v 1.1 2002/01/28 20:32:58 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r6/chooser.sh,v 1.2 2002/03/01 23:08:12 azarah Exp $ + +#if $XSESSION is "", source first /etc/conf.d/basic, and then /etc/rc.conf +if [ -z "$XSESSION" ] +then + [ -f /etc/conf.d/basic ] && source /etc/conf.d/basic + [ -f /etc/rc.conf ] && source /etc/rc.conf +fi #find a match for $XSESSION in /etc/X11/Sessions GENTOO_SESSION="" |