If the right conditions exist, ask if xdm should be started automatically.

Yes, there are machines where you X needs configuration, but let us be
realistic about it: THAT IS AN X BUG.  And there are machines where getty
and xdm fight: THAT IS A CONSOLE DRIVER BUG.  And this commit is going to
force those bugs to eventually matter enough so that they get fixed.   Just
watch.

5 files changed, 34 insertions, 13 deletions

diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md
index 894d02930b5..5c2ee195c57 100644
--- a/distrib/amd64/common/install.md
+++ b/distrib/amd64/common/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.15 2009/04/24 01:43:27 krw Exp $
+#	$OpenBSD: install.md,v 1.16 2009/04/25 03:21:50 deraadt Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -33,6 +33,7 @@
 #
 
 MDXAPERTURE=2
+MDXDM=y
 ARCH=ARCH
 NCPU=$(sysctl -n hw.ncpufound)
 
diff --git a/distrib/i386/common/install.md b/distrib/i386/common/install.md
index 906a0e6ff61..2b2598290b8 100644
--- a/distrib/i386/common/install.md
+++ b/distrib/i386/common/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.38 2009/04/24 01:43:27 krw Exp $
+#	$OpenBSD: install.md,v 1.39 2009/04/25 03:21:51 deraadt Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -33,6 +33,7 @@
 #
 
 MDXAPERTURE=2
+MDXDM=y
 ARCH=ARCH
 NCPU=$(sysctl -n hw.ncpufound)
 
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index a9e18d1b47d..625ae03d194 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.sub,v 1.476 2009/04/25 02:36:32 deraadt Exp $
+#	$OpenBSD: install.sub,v 1.477 2009/04/25 03:21:51 deraadt Exp $
 #	$NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
 #
 # Copyright (c) 1997-2007 Todd Miller, Theo de Raadt, Ken Westerback
@@ -1546,6 +1546,30 @@ populateusrlocal() {
 	fi
 }
 
+xquestions() {
+	local _xdmask=y
+
+	# XXX if any of the X sets are not installed, we should
+	# not ask these questions
+	if [[ -n $MDXAPERTURE ]]; then
+		ask_yn "Do you expect to run the X Window System?"
+		if [[ $resp == y ]]; then
+			sed -e "/^#\(machdep\.allowaperture=${MDXAPERTURE}\)/s//\1	/" \
+				/mnt/etc/sysctl.conf >/tmp/sysctl.conf
+			cp /tmp/sysctl.conf /mnt/etc/sysctl.conf
+		fi
+		_xdmask=$resp	# if aperture was n, do not ask for xdm
+	fi
+
+	if [[ -n $MDXDM && $_xdmask == y ]]; then
+		ask_yn "Do you want the X Window System to be started by xdm(1)?"
+		if [[ $resp == y ]]; then
+			echo "xdm_flags=		# enabled during install" \
+				>>/mnt/etc/rc.conf.local
+		fi
+	fi
+}
+
 questions() {
 	local _d
 
@@ -1571,14 +1595,7 @@ server $1
 		fi
 	fi
 
-	if [[ -n $MDXAPERTURE ]]; then
-		ask_yn "Do you expect to run the X Window System?"
-		if [[ $resp == y ]]; then
-			sed -e "/^#\(machdep\.allowaperture=${MDXAPERTURE}\)/s//\1	/" \
-				/mnt/etc/sysctl.conf >/tmp/sysctl.conf
-			cp /tmp/sysctl.conf /mnt/etc/sysctl.conf
-		fi
-	fi
+	xquestions
 
 	[[ -n $CDEV ]] || return
 	_d=${CPROM:-$CDEV}
diff --git a/distrib/sparc/install.md b/distrib/sparc/install.md
index 5c4c5766991..b1b60512036 100644
--- a/distrib/sparc/install.md
+++ b/distrib/sparc/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.58 2009/04/12 12:56:02 krw Exp $
+#	$OpenBSD: install.md,v 1.59 2009/04/25 03:21:51 deraadt Exp $
 #	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
 #
 #
@@ -34,6 +34,7 @@
 #
 
 MDTERM=sun
+MDXDM=y
 MDDKDEVS='/^sd[0-9] /s/ .*//p;/^x[dy][0-9] /s/ .*//p'
 ARCH=ARCH
 
diff --git a/distrib/zaurus/ramdisk/install.md b/distrib/zaurus/ramdisk/install.md
index 93ae08b7958..0a0f23d1167 100644
--- a/distrib/zaurus/ramdisk/install.md
+++ b/distrib/zaurus/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.19 2009/04/12 12:56:02 krw Exp $
+#	$OpenBSD: install.md,v 1.20 2009/04/25 03:21:51 deraadt Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -32,6 +32,7 @@
 # machine dependent section of installation/upgrade script.
 #
 
+MDXDM=y
 ARCH=ARCH
 
 md_installboot() {