===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- src/etc/rc	2011/07/07 21:00:59	1.358
+++ src/etc/rc	2011/07/07 22:23:56	1.359
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.358 2011/07/07 21:00:59 deraadt Exp $
+#	$OpenBSD: rc,v 1.359 2011/07/07 22:23:56 robert Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -638,14 +638,7 @@
 	echo -n ' aucat';		aucat -l ${aucat_flags}
 fi
 
-if [ X"${wsmoused_flags}" != X"NO" -a -x /usr/sbin/wsmoused ]; then
-	echo -n ' wsmoused';		wsmoused ${wsmoused_flags}
-fi
-
-# Alternatively, on some architectures, xdm may be started in /etc/ttys.
-if [ X"${xdm_flags}" != X"NO" -a -x /usr/X11R6/bin/xdm ]; then
-	echo -n ' xdm';			/usr/X11R6/bin/xdm ${xdm_flags}
-fi
+start_daemon wsmoused xdm
 echo '.'
 
 exit 0