x11-base/xorg-server: Restore xdm-setup init.d script and cleanup the main xdm script a little.

(Portage version: 2.2_rc87_p1/git/Linux x86_64, RepoMan options: --force, signed Manifest commit)

4 files changed, 51 insertions, 30 deletions

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 2c4ced8f..b002fe4f 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA1
 
 AUX 1.7.5.902-fix-tslib-1.0-check.patch 743 RMD160 139969e7c89ccbb6c86a93b7ea74aad2e942cd55 SHA1 621f3dea75aeb84a30279e5854b0ae256f653113 SHA256 03fced212933eb4502554c4fd629ead92027dc13f178ad5c43cd59b7ce615cea
+AUX xdm-setup.initd-1 339 RMD160 dd3f50da114627d2be776b41a0d7d967ebbff477 SHA1 d86813f810aab72b81a72c298c2d230554d8e82e SHA256 018bc6acc70c708d8e3935617b8da2b84a3f5502a4db4c4731c2eaea7d3f04c0
 AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec
-AUX xdm.initd-2 5424 RMD160 a972e044466c5323c8186704d98bcc631e1b678b SHA1 a86e2b17c3d70996c8869ac68afb2fb09268d728 SHA256 7166f5a47fc23cd4af9cef8a5987c809509b7461633e7afccb715f0e3132fffb
+AUX xdm.initd-3 5394 RMD160 7810d9873cd27ab8130bf3bd5dd39a219b18a014 SHA1 52b20375c9e21671081d0dcdf99024fc63b8b2b8 SHA256 f0999a2c7486675e3eb549653e136afaf457400fc7ba17d77f0266a2291ebf42
 AUX xorg-server-1.9-nouveau-default.patch 916 RMD160 0ebdf0fb76364b7fd0c520c3a2f7cc2cc1a83446 SHA1 daddde0f4f4276e12b87354d2e6825ed5c74c6eb SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea
 AUX xorg-server-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200
 AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c
-EBUILD xorg-server-9999.ebuild 7809 RMD160 57230d379e204ec7089191b02299b2af5d6484b6 SHA1 c7e3ea545df0a5f464c9b16e9d0cf4cf76c0ebdb SHA256 2b48f26e3b3b85497c3b351cf78a1e74fb3fab0be9eccdd73af140437c610dbf
+EBUILD xorg-server-9999.ebuild 7840 RMD160 0463c1684c5b61912da42aa653fb985587d16108 SHA1 057a4a7044ff9c10fa946b263874ee4ecebb404c SHA256 ac8f23ddd42f2051edb11e3b85e1c0b06754611957aced8f9d4870e06395e70c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyflNEACgkQnGSe5QXeB7uzPgCggjLc1Jm7vBk4vUkUXnDMQBI8
-qcAAni4ZfUJZ9yBBFZz8mcjqnaIKmA3n
-=vu84
+iEYEARECAAYFAkygX18ACgkQnGSe5QXeB7umWwCghJxnqlTW4Z8+Za9kXU0H2AoW
+G+MAn29yN9bb8/X7KoTKe6fyojQDna2P
+=X98m
 -----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/files/xdm-setup.initd-1 b/x11-base/xorg-server/files/xdm-setup.initd-1
new file mode 100644
index 00000000..6ed3922c
--- /dev/null
+++ b/x11-base/xorg-server/files/xdm-setup.initd-1
@@ -0,0 +1,14 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm-setup.initd-1,v 1.5 2009/09/24 17:07:56 williamh Exp $
+
+depend() {
+	need localmount
+}
+
+start() {
+	if get_bootparam "nox" ; then
+		touch /etc/.noxdm
+	fi
+}
diff --git a/x11-base/xorg-server/files/xdm.initd-2 b/x11-base/xorg-server/files/xdm.initd-3
index 2134b2ad..34719773 100755
--- a/x11-base/xorg-server/files/xdm.initd-2
+++ b/x11-base/xorg-server/files/xdm.initd-3
@@ -37,7 +37,7 @@
 # 04 March 2002
 
 depend() {
-	need localmount
+	need localmount xdm-setup
 
 	# this should start as early as possible
 	# we can't do 'before *' as that breaks it
@@ -55,12 +55,15 @@ depend() {
 }
 
 setup_dm() {
-	local MY_XDM="$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')"
+	local MY_XDM
+	
+	MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')
 
 	# Load our root path from profile.env
 	# Needed for kdm
-	PATH="${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")"
+	PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")
 
+	NAME=
 	case "${MY_XDM}" in
 		kdm|kde)
 			EXE="$(which kdm)"
@@ -93,7 +96,7 @@ setup_dm() {
 			PIDFILE="/var/run/${MY_XDM}.pid"
 
 			# warn user that he is doing sick things if the exe was not found
-			if [ "${EXE}" = "" ]; then
+			if [ -z "${EXE}" ]; then
 				echo "ERROR: Your XDM value is invalid."
 				echo "  No ${MY_XDM} executable could be found on your system."
 			fi
@@ -123,10 +126,10 @@ vtstatic() {
 }
 
 start() {
-	local EXE= NAME= PIDFILE=
+	local EXE NAME PIDFILE
 	setup_dm
 
-	if [ -f /etc/.noxdm ] || get_bootparam "nox" ; then
+	if [ -f /etc/.noxdm ]; then
 		einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed."
 		rm /etc/.noxdm
 		return 0
@@ -141,9 +144,9 @@ start() {
 
 	if [ -n "${CHECKVT-y}" ] ; then
 		if vtstatic "${CHECKVT:-7}" ; then
-			if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ] ; then
+			if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then
 				ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later"
-				telinit a >/dev/null 2>/dev/null
+				telinit a >/dev/null 2>&1
 				return 0
 			else
 				eerror "Something is already defined on VT ${CHECKVT:-7}, not starting"
@@ -157,41 +160,43 @@ start() {
 }
 
 stop() {
-	local retval=0
-	local curvt=
-	if [ -t 0 ] ; then
-		if type fgconsole >/dev/null 2>/dev/null ; then
-			curvt="$(fgconsole 2>/dev/null)"
+	local curvt retval
+
+	retval=0
+	if [ -t 0 ]; then
+		if type fgconsole >/dev/null 2>&1; then
+			curvt=$(fgconsole 2>/dev/null)
 		else
-			curvt="$(tty)"
+			curvt=$(tty)
 			case "${curvt}" in
-				/dev/ttyv[0-9]*) curvt="${curvt#/dev/ttyv*}" ;;
+				/dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;;
 				*) curvt= ;;
 			esac
 		fi
 	fi
-	local myexe="$(get_options "service")"
-	local myname="$(get_options "name")"
-	local mypidfile="$(get_options "pidfile")"
-	local myservice=${myexe##*/}
+	local myexe myname mypidfile myservice
+	myexe=$(get_options "service")
+	myname=$(get_options "name")
+	mypidfile=$(get_options "pidfile")
+	myservice=${myexe##*/}
 
 	[ -z "${myexe}" ] && return 0
 
 	ebegin "Stopping ${myservice}"
 
-	if start-stop-daemon --quiet --test --stop --exec "${myexe}" ; then
+	if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then
 		start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \
 			${mypidfile:+--pidfile} ${mypidfile} \
 			${myname:+--name} ${myname}
-		retval=$?
+		retval=${?}
 	fi
 
 	# switch back to original vt
-	if [ -n "${curvt}" ] ; then
-		if type chvt >/dev/null 2>/dev/null ; then
+	if [ -n "${curvt}" ]; then
+		if type chvt >/dev/null 2>&1; then
 			chvt "${curvt}"
 		else
-			vidcontrol -s "$((${curvt} + 1))"
+			vidcontrol -s "$((curvt + 1))"
 		fi
 	fi
 
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 0ef001c9..49132b72 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -206,7 +206,8 @@ src_install() {
 			|| die "couldn't install xorg.conf.example"
 	fi
 
-	newinitd "${FILESDIR}"/xdm.initd-2 xdm || die "initd file install failed"
+	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup || die
+	newinitd "${FILESDIR}"/xdm.initd-3 xdm || die
 	newconfd "${FILESDIR}"/xdm.confd-3 xdm || die
 
 	# install the @x11-module-rebuild set for Portage