--- xdm.org	2004-03-04 11:55:23.000000000 +0100
+++ xdm	2005-02-09 19:30:31.533742784 +0100
@@ -78,7 +78,13 @@
 	#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
+	if is_vserver_guest; then
+		einfo "we are on vserver guest ..."
+		/etc/X11/startDM.sh
+	else
+		einfo "we are on vserver master-host ..."
+		/sbin/telinit a &>/dev/null
+	fi
 	eend 0
 }
 
@@ -100,7 +106,14 @@
 	else
 		retval=1
 	fi
-	
+
+	if [ "$(ps -A | grep -e "${myservice}")" ]; then
+		einfo "we need to kill harder ..."
+		start-stop-daemon --stop --quiet \
+			--signal 9 --exe ${myexe} &>/dev/null
+		retval=$?
+	fi
+		
 	#switch back to original vt
 	chvt "${curvt}" &>/dev/null
 	eend ${retval} "Error stopping ${myservice}."