diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-12-21 12:29:07 +0100 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-12-21 12:29:07 +0100 |
| commit | e7e864cb232334020a19cc431406cfe928dddb89 (patch) | |
| tree | c2452687f42c6bc11ffa36bcc56d12fdf02389a1 /x11-apps/xinit | |
| parent | [media-libs/mesa] Update the elog messages a bit. (diff) | |
| download | x11-e7e864cb232334020a19cc431406cfe928dddb89.tar.gz x11-e7e864cb232334020a19cc431406cfe928dddb89.tar.bz2 x11-e7e864cb232334020a19cc431406cfe928dddb89.zip | |
[x11-apps/xinit] Update bit xdm handling with various non-default xdm values.
Diffstat (limited to 'x11-apps/xinit')
| -rw-r--r-- | x11-apps/xinit/Manifest | 2 | ||||
| -rwxr-xr-x | x11-apps/xinit/files/xdm.initd-4 | 21 |
2 files changed, 12 insertions, 11 deletions
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest index 356b198a..36bb584c 100644 --- a/x11-apps/xinit/Manifest +++ b/x11-apps/xinit/Manifest @@ -5,7 +5,7 @@ AUX chooser.sh 1301 RMD160 47ae0768ed54f235443399bdf08632c9f5cd3d10 SHA1 c378244 AUX startDM.sh 858 RMD160 d7ef866ddd09e3d4117b3363aaa6382a9b8cd153 SHA1 1b826dfb4d5a184d6d7cc1995d685b55c9c188ac SHA256 a7aca1e37e5b8fecb49aa96c4e2850547a47e154edabcdbd1cfcb8ab49337549 AUX xdm-setup.initd-1 339 RMD160 dd3f50da114627d2be776b41a0d7d967ebbff477 SHA1 d86813f810aab72b81a72c298c2d230554d8e82e SHA256 018bc6acc70c708d8e3935617b8da2b84a3f5502a4db4c4731c2eaea7d3f04c0 AUX xdm.confd-2 1262 RMD160 188ec46199168d90cb09cfe6b946bbf69f426c0c SHA1 4931a80b17a41ed4812aedf7fd1082df7e9f1335 SHA256 44042c13cbc759e2580a32f8a30b58eb2eb71c1d5f4b4cd94e9de476667862bb -AUX xdm.initd-4 6416 RMD160 d71798f2d2a0c4cb08ff4c9b21a59aabf2182c63 SHA1 2556e7fa726739fbbb3ef854c50099362acf76ca SHA256 2e12f6ad16b87b85961207213635ca1f4f7f565350b4cab8832a4c428e5c9e02 +AUX xdm.initd-4 6515 RMD160 d42bd4fe05d64c1e432aac26141f052d093fc563 SHA1 b2a997a564441d2f543d80d19201897bbe6f363a SHA256 341a3a2fab2618e20784394adc2a2af5e60234cca7d6c3f9cc863308a836d158 AUX xserver.pamd 125 RMD160 4b75f8bf5e68ac7181a22beaccc153ac250eb8e9 SHA1 e35845021328044659036b9f82a95c17f21beb25 SHA256 f179c3417b94295fe12776f9da4a08898a3ee4199e26abff6457717caeb29bb2 AUX xserverrc 30 RMD160 7575b72f2f5ec4afba3e3700c213a7fbe40a0f8d SHA1 febf89ebfcc056c16bf70a4e651f4074af71b224 SHA256 18c040add4d137aaa58f76b134088acb1269dd291a14bcc283765c6c897d49fe EBUILD xinit-9999.ebuild 1865 RMD160 e8659510c5139eda25ab68eb4c0bfb5c46a171c4 SHA1 49f84ef0628dad5a6519882aab6a199f3ca6849a SHA256 419efb238e93ec671bcd95fef69429486c088901ee9b719be87002aaaf502d05 diff --git a/x11-apps/xinit/files/xdm.initd-4 b/x11-apps/xinit/files/xdm.initd-4 index 04b4430d..4b91e13c 100755 --- 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-3,v 1.5 2009/09/24 17:07:56 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-4,v 1.1 2009/11/14 14:18:43 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 |