--- xdm.old	2009-02-06 12:11:29.000000000 +0100
+++ xdm	2009-02-06 12:15:53.000000000 +0100
@@ -85,6 +85,12 @@
 			EXE=/usr/bin/wdm
 			PIDFILE=
 			;;
+		none)
+			test -n "$(id -u ${XUSER} 2>/dev/null)" && \
+			EXE=/usr/bin/startx \
+			PIDFILE=/var/run/x.pid \
+			NAME=startx
+			;;
 		*)
 			EXE=
 			# Fix #65586, where MY_XDM is empty so EXE=somedir
@@ -140,6 +146,7 @@
 	save_options "service" "${EXE}"
 	save_options "name"    "${NAME}"
 	save_options "pidfile" "${PIDFILE}"
+	save_options "xuser"	"${XUSER}"
 
 	if [ -n "${CHECKVT-y}" ] ; then
 		if vtstatic "${CHECKVT:-7}" ; then
@@ -154,7 +161,11 @@
 		fi
 	fi
 	
-	/etc/X11/startDM.sh
+	if [ -n "${XUSER}" ] && [ -x /sbin/telinit ]; then
+		telinit a >/dev/null 2>&1
+	else
+		/etc/X11/startDM.sh
+	fi
 	eend 0
 }