[gentoo-commits] gentoo-x86 commit in x11-apps/xinit/files: xdm.initd-2

["Tomas Chvatal (scarabeus)" <scarabeus@gentoo.org>]

scarabeus    09/08/31 09:09:18

  Modified:             xdm.initd-2
  Log:
  Adjust xdm init script to die bit sane way. Per bug #207075.
  (Portage version: 2.2_rc38/cvs/Linux i686)

Revision  Changes    Path
1.3                  x11-apps/xinit/files/xdm.initd-2

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/files/xdm.initd-2?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/files/xdm.initd-2?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/files/xdm.initd-2?r1=1.2&r2=1.3

Index: xdm.initd-2
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xdm.initd-2	30 May 2009 17:34:21 -0000	1.2
+++ xdm.initd-2	31 Aug 2009 09:09:18 -0000	1.3
@@ -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-2,v 1.2 2009/05/30 17:34:21 miknix Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-2,v 1.3 2009/08/31 09:09:18 scarabeus Exp $
 
 # This is here to serve as a note to myself, and future developers.
 #
@@ -104,6 +104,11 @@
 	if ! [ -x "${EXE}" ] ; then
 		EXE=/usr/bin/xdm
 		PIDFILE=/var/run/xdm.pid
+		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
+		fi
 	fi
 }