diff options
Diffstat (limited to 'x11-apps/xdm/files/xdm.start')
| -rwxr-xr-x | x11-apps/xdm/files/xdm.start | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/x11-apps/xdm/files/xdm.start b/x11-apps/xdm/files/xdm.start index ab8eee1167cf..5015d462abe2 100755 --- a/x11-apps/xdm/files/xdm.start +++ b/x11-apps/xdm/files/xdm.start @@ -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/xdm/files/xdm.start,v 1.1 2005/08/16 02:53:03 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/files/xdm.start,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $ # This is here to serve as a note to myself, and future developers. # @@ -24,10 +24,10 @@ # runlevel never gets changed to this runlevel. Along with the "a" # runlevel, the "once" key word means that startDM.sh will only be # run when we specify it to run, thus eliminating respawning -# startDM.sh when "xdm" is not added to the default runleve, as was +# startDM.sh when "xdm" is not added to the default runlevel, as was # done previously. # -# This script then just calls "tellinit a", and init will run +# This script then just calls "telinit a", and init will run # /etc/X11/startDM.sh after the current runlevel completes (this # script should only be added to the actual runlevel the user is # using). @@ -62,17 +62,14 @@ setup_dm() { ;; *) EXE= - for x in /usr/bin /usr/X11R6/bin - do - # Fix #65586, where MY_XDM is empty so EXE=somedir - [ -x "${x}/${MY_XDM}" -a -f "${x}/${MY_XDM}" ] \ - && EXE="${x}/${MY_XDM}" - done - [ -z "${EXE}" ] && EXE="/usr/X11R6/bin/xdm" + # Fix #65586, where MY_XDM is empty so EXE=somedir + [ -x "/usr/bin/${MY_XDM}" -a -f "/usr/bin/${MY_XDM}" ] \ + && EXE="/usr/bin/${MY_XDM}" + [ -z "${EXE}" ] && EXE="/usr/bin/xdm" ;; esac - test ! -x "${EXE}" && EXE=/usr/X11R6/bin/xdm + test ! -x "${EXE}" && EXE=/usr/bin/xdm SERVICE="${EXE##*/}" } |