summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2006-04-20 05:38:24 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2006-04-20 05:38:24 +0000
commit630a00c54363e6bc179115a209708aeb21b0b1a5 (patch)
treeff3010bc18c7571ede6a1e932b483c391a28d7de /x11-apps/xdm
parentAdd ~x86-fbsd keyword as requested. (diff)
downloadhistorical-630a00c54363e6bc179115a209708aeb21b0b1a5.tar.gz
historical-630a00c54363e6bc179115a209708aeb21b0b1a5.tar.bz2
historical-630a00c54363e6bc179115a209708aeb21b0b1a5.zip
Remove unused file.
Package-Manager: portage-2.1_pre7-r5
Diffstat (limited to 'x11-apps/xdm')
-rw-r--r--x11-apps/xdm/ChangeLog5
-rw-r--r--x11-apps/xdm/Manifest9
-rwxr-xr-xx11-apps/xdm/files/xdm.start147
3 files changed, 7 insertions, 154 deletions
diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index 546a4abaf4f0..1a3b94af446e 100644
--- a/x11-apps/xdm/ChangeLog
+++ b/x11-apps/xdm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-apps/xdm
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.39 2006/04/08 21:00:31 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.40 2006/04/20 05:38:24 spyderous Exp $
+
+ 20 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>; -files/xdm.start:
+ Remove unused file.
08 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>; -xdm-1.0.1.ebuild:
Pull old ebuild.
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index 7366beb672ad..c67bf56b806c 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -1,6 +1,6 @@
-MD5 739b8d221d0d39bc82e205293d6d8430 ChangeLog 6475
-RMD160 b7d6e377f4c96dc5aae2bf2146e8f3c6d333197b ChangeLog 6475
-SHA256 83f3483d36e95109d3903db9a25f99f01fb9c3248b282467433af6045d62b894 ChangeLog 6475
+MD5 dbfe6d9240e8fb7080375266509caa33 ChangeLog 6571
+RMD160 818035b379682728142b29ba462f0808c5efea9f ChangeLog 6571
+SHA256 4a37c2ad698e9936e4d9c8c73553a472e2a620f8a51fc3576a73f0ab4d31e594 ChangeLog 6571
MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/Xsession 1521
RMD160 c02efb9e96a8dc836d71aa1b47c36358ad61129c files/Xsession 1521
SHA256 8a09cd1cef9ebce190e13009e8b21a8504eac1cec3fc31a10d3740b6c7aa49b6 files/Xsession 1521
@@ -10,9 +10,6 @@ SHA256 07f9231d76c3ab21b874127d4d269f35516a76cdf91322b959e78cc640ed3979 files/di
MD5 4a17967449d093f6430fbee47a24afba files/xdm.pamd 169
RMD160 a48ee2ed15d64412fb0035b3c18fe602d6175501 files/xdm.pamd 169
SHA256 edf108933d7ebfdd0b601e7bbe0a47601f16a5e45a1af26fde3eefce8079a288 files/xdm.pamd 169
-MD5 584252c9909d51023ea18799151cf12e files/xdm.start 3415
-RMD160 f1114b815e2ba615be97c8d46a239e01671149f7 files/xdm.start 3415
-SHA256 50995380f46ad8497fbf09cc766a2646c97ddc6d0038197e6565dc5c410f6268 files/xdm.start 3415
MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
diff --git a/x11-apps/xdm/files/xdm.start b/x11-apps/xdm/files/xdm.start
deleted file mode 100755
index c8c04211de91..000000000000
--- a/x11-apps/xdm/files/xdm.start
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/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.3 2005/08/30 21:47:40 joshuabaergen Exp $
-
-# This is here to serve as a note to myself, and future developers.
-#
-# Any Display manager (gdm,kdm,xdm) have the following problem: if
-# it is started before any getty, and no vt is specified, it will
-# usually run on vt2. When the getty on vt2 then starts, and the
-# DM is already started, the getty will take control of the keyboard,
-# leaving us with a "dead" keyboard.
-#
-# Resolution: add the following line to /etc/inittab
-#
-# x:a:once:/etc/X11/startDM.sh
-#
-# and have /etc/X11/startDM.sh start the DM in daemon mode if
-# a lock is present (with the info of what DM should be started),
-# else just fall through.
-#
-# How this basically works, is the "a" runlevel is a additional
-# runlevel that you can use to fork processes with init, but the
-# 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 runlevel, as was
-# done previously.
-#
-# 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).
-#
-# Martin Schlemmer
-# aka Azarah
-# 04 March 2002
-
-
-# Start X Font Server before X
-depend() {
- use xfs hotplug
-}
-
-setup_dm() {
- source /etc/profile.env
- export PATH="/bin:/sbin:/usr/bin:/usr/sbin:${ROOTPATH}"
-
- local MY_XDM="$(echo ${DISPLAYMANAGER} | awk '{ print tolower($1) }')"
- case "${MY_XDM}" in
- kdm|kde|kde2|kde3)
- EXE="$(which kdm)"
- ;;
- entrance*)
- EXE="$(which entranced)"
- ;;
- gdm|gnome)
- EXE=/usr/bin/gdm
- ;;
- wdm)
- EXE=/usr/bin/wdm
- ;;
- *)
- EXE=
- # 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/bin/xdm
-
- SERVICE="${EXE##*/}"
-}
-
-cmdline_opt() {
- if [[ "$#" -ne 1 ]]; then
- return 1
- fi
-
- for opt in $(</proc/cmdline); do
- case ${opt} in
- ${1}) eval ${1}="true" ;;
- esac
- done
-}
-
-nox() {
- # Don't start X if we were passed 'nox' at boot (#83680)
- cmdline_opt nox
-
- if [[ "$?" -ne 0 ]]; then
- return 1
- fi
-
- if [[ -n "${nox}" ]]; then
- return 0
- else
- return 1
- fi
-}
-
-start() {
- setup_dm
-
- if nox; then
- einfo "Skipping ${EXE}, received 'nox'"
- else
- ebegin "Setting up ${SERVICE}"
- #save the prefered DM
- save_options "service" "${EXE}"
- #tell init to run /etc/X11/startDM.sh after current
- #runlevel is finished (should *not* be in the "boot"
- # runlevel).
- /sbin/telinit a &>/dev/null
- eend 0
- fi
-
-}
-
-stop() {
- local retval=0
- local curvt="$(fgconsole)"
- local myexe="$(get_options "service")"
- local myservice="${myexe##*/}"
-
- ebegin "Stopping ${myservice}"
- rm -f ${svcdir}/options/xdm/service
-
- if [ "$(ps -A | grep -e "${myservice}")" ]
- then
- start-stop-daemon --stop --quiet \
- --exe ${myexe} &>/dev/null
-
- retval=$?
- fi
-
- #switch back to original vt
- chvt "${curvt}" &>/dev/null
- eend ${retval} "Error stopping ${myservice}."
-
- return ${retval}
-}
-
-
-# vim:ts=4