From 6d5e5d6615d0bae2ef1427949f6d4645c5ffee71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sat, 2 Oct 2010 18:57:47 +0200
Subject: [PATCH 1/2] x11-base/xorg-server: Support lxdm within the xdm init.d script.

(Portage version: 2.2_rc88_p61/git/Linux x86_64, signed Manifest commit)
---
 x11-base/xorg-server/Manifest          |   14 ++++++++++++--
 x11-base/xorg-server/files/xdm.initd-3 |   13 ++++++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 78a104e..d746d1d 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,19 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+- -----BEGIN PGP SIGNED MESSAGE-----
+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-3 5394 RMD160 7810d9873cd27ab8130bf3bd5dd39a219b18a014 SHA1 52b20375c9e21671081d0dcdf99024fc63b8b2b8 SHA256 f0999a2c7486675e3eb549653e136afaf457400fc7ba17d77f0266a2291ebf42
+AUX xdm.initd-3 5536 RMD160 c91345efdc2cf3f8edf1ad7e39d68854b952d50e SHA1 c49f1348de165a1248a41788155ea7266172be4e SHA256 bb63b886d738705d9ae05239c1de3cab2661bbee2dad48083303c60059e92584
 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 7820 RMD160 142cb0ebdb078f6bf0616cfcb289ef0744e9d4c3 SHA1 fd4bd06e7a2d6c15ec511ee22a2f2f16a816c959 SHA256 4e1efa19e4a3fd1680d5458a7c5fb07cfc96ebcfb2f7a86f6c2df7e12fba1f91
 MISC metadata.xml 499 RMD160 13985f2e8ee45fa43d4689f4c09ae4d3c8fe7e59 SHA1 b84c2d3e23c3eae539fa1c37aa0e0345083bedea SHA256 f2f68c9cdaf48810cc035fb5b3bb3467569be2aabbe5eb74405b75427d5193ba
------BEGIN PGP SIGNATURE-----
+- -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
 iEYEARECAAYFAkynY+oACgkQnGSe5QXeB7vueACgnOIhTWg+0CvwWrELRxbJ3jUj
 7DoAnjg2eNavJYB0bFU9GB66dYWkZKth
 =NAUJ
+- -----END PGP SIGNATURE-----
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkynZIsACgkQnGSe5QXeB7uGZQCeNKx4T6lZp0bRh/EEhMjb1bVT
+2hwAn3K4CFRSyjXGAz0lZ8NlYX4c2P2k
+=yD2g
 -----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/files/xdm.initd-3 b/x11-base/xorg-server/files/xdm.initd-3
index 3471977..08840c3 100755
--- a/x11-base/xorg-server/files/xdm.initd-3
+++ b/x11-base/xorg-server/files/xdm.initd-3
@@ -64,9 +64,10 @@ setup_dm() {
 	PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")
 
 	NAME=
+	BACKGROUND=0
 	case "${MY_XDM}" in
 		kdm|kde)
-			EXE="$(which kdm)"
+			EXE=$(which kdm)
 			PIDFILE=/var/run/kdm.pid
 			;;
 		kdm-*)
@@ -90,9 +91,14 @@ setup_dm() {
 			EXE=/usr/bin/gpe-dm
 			PIDFILE=/var/run/gpe-dm.pid
 			;;
+		lxdm)
+			EXE=/usr/sbin/lxdm
+			PIDFILE=/var/run/lxdm.pid
+			BACKGROUND=1
+			;;
 		*)
 			# first find out if there is such executable
-			EXE="$(which ${MY_XDM} 2>/dev/null)"
+			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
@@ -126,7 +132,7 @@ vtstatic() {
 }
 
 start() {
-	local EXE NAME PIDFILE
+	local EXE NAME PIDFILE BACKGROUND
 	setup_dm
 
 	if [ -f /etc/.noxdm ]; then
@@ -141,6 +147,7 @@ start() {
 	save_options "service" "${EXE}"
 	save_options "name"    "${NAME}"
 	save_options "pidfile" "${PIDFILE}"
+	save_options "bkgnd"   "${BACKGROUND}"
 
 	if [ -n "${CHECKVT-y}" ] ; then
 		if vtstatic "${CHECKVT:-7}" ; then
-- 
1.7.3.1