diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-08-31 09:09:18 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-08-31 09:09:18 +0000 |
| commit | 1750f3429161cbcaf074c6422bcf28367ff7b9f7 (patch) | |
| tree | 7d8005f9f7b84ac85328fb2d8098891c9b3ad216 /x11-apps/xinit | |
| parent | Again update dependencies w.r.t. bug 264230, fully-split-out poppler transition. (diff) | |
| download | gentoo-2-1750f3429161cbcaf074c6422bcf28367ff7b9f7.tar.gz gentoo-2-1750f3429161cbcaf074c6422bcf28367ff7b9f7.tar.bz2 gentoo-2-1750f3429161cbcaf074c6422bcf28367ff7b9f7.zip | |
Adjust xdm init script to die bit sane way. Per bug #207075.
(Portage version: 2.2_rc38/cvs/Linux i686)
Diffstat (limited to 'x11-apps/xinit')
| -rw-r--r-- | x11-apps/xinit/ChangeLog | 5 | ||||
| -rwxr-xr-x | x11-apps/xinit/files/xdm.initd-2 | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog index 161cc50d7769..190b3833c22d 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.131 2009/08/28 14:29:46 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.132 2009/08/31 09:09:18 scarabeus Exp $ + + 31 Aug 2009; Tomáš Chvátal <scarabeus@gentoo.org> files/xdm.initd-2: + Adjust xdm init script to die bit sane way. Per bug #207075. 28 Aug 2009; Petteri Räty <betelgeuse@gentoo.org> xinit-1.0.8-r4.ebuild: Migrate to EAPI 2 in order to get rid of built_with_use. diff --git a/x11-apps/xinit/files/xdm.initd-2 b/x11-apps/xinit/files/xdm.initd-2 index 5f6b4696ecab..95da3a7f5e9c 100755 --- a/x11-apps/xinit/files/xdm.initd-2 +++ b/x11-apps/xinit/files/xdm.initd-2 @@ -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 @@ setup_dm() { 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 } |