summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Hall <halex@cvs.openbsd.org>2009-05-31 20:57:13 +0000
committerAlexander Hall <halex@cvs.openbsd.org>2009-05-31 20:57:13 +0000
commit7b56dbbe1914f8621c7451cdd0d9d6f2fb779b84 (patch)
tree2ed3cf8a3ece3c7f05e17ae178bae974357db6d2
parent8dc2a185824cdfef50fdeef6f70dece0b1f2005d (diff)
Make sure xdm is installed before trying to run it
ok deraadt@
-rw-r--r--etc/rc4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/rc b/etc/rc
index 69b827cb9e9..dca9f8f3a94 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.324 2009/04/17 17:17:03 henning Exp $
+# $OpenBSD: rc,v 1.325 2009/05/31 20:57:12 halex Exp $
# System startup script run by init on autoboot
# or after single-user.
@@ -809,7 +809,7 @@ if [ X"${wsmoused_flags}" != X"NO" -a -x /usr/sbin/wsmoused ]; then
fi
# Alternatively, on some architectures, xdm may be started in /etc/ttys.
-if [ X"${xdm_flags}" != X"NO" ]; then
+if [ X"${xdm_flags}" != X"NO" -a -x /usr/X11R6/bin/xdm ]; then
echo 'starting xdm...'; /usr/X11R6/bin/xdm ${xdm_flags}
fi