diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-12-21 11:29:45 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-12-21 11:29:45 +0000 |
| commit | 4dd6694c9eaf6f298501f21a81ab33559663870e (patch) | |
| tree | c17af2f5abf0ae398288c135066f4909830cedc5 /x11-apps/xinit | |
| parent | Fix old-style qt4 depend (diff) | |
| download | gentoo-2-4dd6694c9eaf6f298501f21a81ab33559663870e.tar.gz gentoo-2-4dd6694c9eaf6f298501f21a81ab33559663870e.tar.bz2 gentoo-2-4dd6694c9eaf6f298501f21a81ab33559663870e.zip | |
Update bit xdm handling with various non-default xdm values.
(Portage version: 2.2_rc60/cvs/Linux x86_64)
Diffstat (limited to 'x11-apps/xinit')
| -rw-r--r-- | x11-apps/xinit/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-apps/xinit/files/xdm.initd-4 | 21 |
2 files changed, 15 insertions, 11 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog index 9909cd0e54a0..3cf876f6b295 100644 --- a/x11-apps/xinit/ChangeLog +++ b/x11-apps/xinit/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-apps/xinit # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.172 2009/12/15 19:15:13 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.173 2009/12/21 11:29:45 scarabeus Exp $ + + 21 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> files/xdm.initd-4: + Update bit xdm handling with various non-default xdm values. 15 Dec 2009; Brent Baude <ranger@gentoo.org> xinit-1.2.0-r3.ebuild: Marking xinit-1.2.0-r3 ppc64 stable for bug 294958 diff --git a/x11-apps/xinit/files/xdm.initd-4 b/x11-apps/xinit/files/xdm.initd-4 index 5e4afca770f9..d4f6082eb106 100644 --- a/x11-apps/xinit/files/xdm.initd-4 +++ b/x11-apps/xinit/files/xdm.initd-4 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-4,v 1.1 2009/11/14 14:18:43 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-4,v 1.2 2009/12/21 11:29:45 scarabeus Exp $ # This is here to serve as a note to myself, and future developers. # @@ -132,21 +132,22 @@ setup_dm() { PIDFILE=/var/run/gpe-dm.pid ;; *) - EXE= - # Fix #65586, where MY_XDM is empty so EXE=somedir - [ -x "/usr/bin/${MY_XDM}" ] && [ -f "/usr/bin/${MY_XDM}" ] \ - && EXE="/usr/bin/${MY_XDM}" - if [ -z "${EXE}" ] ; then - EXE=/usr/bin/xdm - PIDFILE=/var/run/xdm.pid + # first find out if there is such executable + EXE="$(which ${MY_XDM} 2>/dev/null)" + PIDFILE="/var/run/${MY_XDM}.pid" + + # warn user that he is doing sick things if the exe was not found + if [ "${EXE}" = "" ]; then + echo "ERROR: Your XDM value is invalid." + echo " No ${MY_XDM} executable could be found on your system." fi ;; esac - if ! [ -x "${EXE}" ] ; then + if ! [ -x "${EXE}" ]; then EXE=/usr/bin/xdm PIDFILE=/var/run/xdm.pid - if ! [ -x "/usr/bin/xdm" ] ; then + if ! [ -x "/usr/bin/xdm" ]; then echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm," echo " or install x11-apps/xdm package" eend 255 |