Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-apps/xinit/files: xdm.initd-2
Date: Mon, 31 Aug 2009 04:00:25
Message-Id: E1Mi2t4-0007Hg-Gg@stork.gentoo.org
1 scarabeus 09/08/31 09:09:18
2
3 Modified: xdm.initd-2
4 Log:
5 Adjust xdm init script to die bit sane way. Per bug #207075.
6 (Portage version: 2.2_rc38/cvs/Linux i686)
7
8 Revision Changes Path
9 1.3 x11-apps/xinit/files/xdm.initd-2
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/files/xdm.initd-2?rev=1.3&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/files/xdm.initd-2?rev=1.3&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/files/xdm.initd-2?r1=1.2&r2=1.3
14
15 Index: xdm.initd-2
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-2,v
18 retrieving revision 1.2
19 retrieving revision 1.3
20 diff -u -r1.2 -r1.3
21 --- xdm.initd-2 30 May 2009 17:34:21 -0000 1.2
22 +++ xdm.initd-2 31 Aug 2009 09:09:18 -0000 1.3
23 @@ -1,7 +1,7 @@
24 #!/sbin/runscript
25 # Copyright 1999-2004 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License, v2
27 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-2,v 1.2 2009/05/30 17:34:21 miknix Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-2,v 1.3 2009/08/31 09:09:18 scarabeus Exp $
29
30 # This is here to serve as a note to myself, and future developers.
31 #
32 @@ -104,6 +104,11 @@
33 if ! [ -x "${EXE}" ] ; then
34 EXE=/usr/bin/xdm
35 PIDFILE=/var/run/xdm.pid
36 + if ! [ -x "/usr/bin/xdm" ] ; then
37 + echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm,"
38 + echo " or install x11-apps/xdm package"
39 + eend 255
40 + fi
41 fi
42 }