Eliminate md_questions(). It was used only to control the setting of

machdep.allowaperture. Remove the setting of machdep.allowaperture
from md_installboot().

Add MDXAPERTURE variable to relevant architectures.

Add a new function set_machdep_allowaperture(). It is called *after*
install_sets() (which changes when the X Window question is asked), and
if MDXAPERTURE is present modifies sysctl.conf.

Shrinks overall size for i386, macppc, sparc64 (which used md_questions
for machdep.allowaperture) but increases size a bit for other
architectures since set_machep_allowaperture is in install.sub.

15 files changed, 43 insertions, 121 deletions

diff --git a/distrib/alpha/common/install.md b/distrib/alpha/common/install.md
index 269fc8474ff..9b46c2346f9 100644
--- a/distrib/alpha/common/install.md
+++ b/distrib/alpha/common/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.9 2002/05/18 17:56:03 krw Exp $
+#       $OpenBSD: install.md,v 1.10 2002/05/20 16:53:57 krw Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -46,10 +46,6 @@ ARCH=ARCH
 md_set_term() {
 }
 
-md_questions() {
-	:
-}
-
 md_installboot() {
 	local _rawdev
 
diff --git a/distrib/amiga/install.md b/distrib/amiga/install.md
index 0b4320012ff..0ae72afecc0 100644
--- a/distrib/amiga/install.md
+++ b/distrib/amiga/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.18 2002/05/18 17:56:03 krw Exp $
+#	$OpenBSD: install.md,v 1.19 2002/05/20 16:53:57 krw Exp $
 #	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
 #
 #
@@ -49,10 +49,6 @@ ARCH=ARCH
 md_set_term() {
 }
 
-md_questions() {
-	:
-}
-
 md_installboot() {
 	# Nothing needed
 }
diff --git a/distrib/hp300/ramdisk/install.md b/distrib/hp300/ramdisk/install.md
index 8b141f43d37..30390ae1589 100644
--- a/distrib/hp300/ramdisk/install.md
+++ b/distrib/hp300/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.31 2002/05/18 17:56:03 krw Exp $
+#	$OpenBSD: install.md,v 1.32 2002/05/20 16:53:57 krw Exp $
 #	$NetBSD: install.md,v 1.1.2.4 1996/08/26 15:45:14 gwr Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -49,10 +49,6 @@ ARCH=ARCH
 md_set_term() {
 }
 
-md_questions() {
-	:
-}
-
 md_installboot() {
 	# $1 is the root disk
 
diff --git a/distrib/i386/common/install.md b/distrib/i386/common/install.md
index 7d95492e401..504aaf1b002 100644
--- a/distrib/i386/common/install.md
+++ b/distrib/i386/common/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.7 2002/05/18 19:28:50 krw Exp $
+#	$OpenBSD: install.md,v 1.8 2002/05/20 16:53:57 krw Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -43,6 +43,7 @@
 MDSETS=kernel
 MDFSTYPE=msdos
 MDFSOPTS=-l
+MDXAPERTURE=2
 ARCH=ARCH
 
 md_set_term() {
@@ -97,30 +98,10 @@ __EOT
 	done
 }
 
-md_questions() {
-	echo
-	ask "Do you expect to run the X Window System?" y
-	case "$resp" in
-	y*|Y*)
-		xfree86=y
-		;;
-	esac
-	echo
-}
-
 md_installboot() {
 	echo Installing boot block...
 	cp /usr/mdec/boot /mnt/boot
 	/usr/mdec/installboot -v /mnt/boot /usr/mdec/biosboot ${1}
-
-	if [ "$xfree86" = y ]; then
-		echo
-		echo "Enabling machdep.allowaperture. Read xf86(4) for more information."
-		echo '1,$s/^#machdep\.allowaperture=2/machdep\.allowaperture=2	/
-w
-q' | ed /mnt/etc/sysctl.conf 2> /dev/null
-		echo
-	fi
 }
 
 md_checkfordisklabel() {
diff --git a/distrib/mac68k/ramdisk/install.md b/distrib/mac68k/ramdisk/install.md
index 297242e9abb..aab070ca45a 100644
--- a/distrib/mac68k/ramdisk/install.md
+++ b/distrib/mac68k/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.13 2002/05/18 17:56:03 krw Exp $
+#       $OpenBSD: install.md,v 1.14 2002/05/20 16:53:57 krw Exp $
 #
 # Copyright (c) 2002, Miodrag Vallat.
 # All rights reserved.
@@ -70,10 +70,6 @@ ARCH=ARCH
 md_set_term() {
 }
 
-md_questions() {
-	:
-}
-
 md_installboot() {
 	# no standalone boot block
 	:
diff --git a/distrib/macppc/ramdisk/install.md b/distrib/macppc/ramdisk/install.md
index 1ac086e4dbb..4f52e2a934c 100644
--- a/distrib/macppc/ramdisk/install.md
+++ b/distrib/macppc/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.14 2002/05/19 16:16:05 krw Exp $
+#	$OpenBSD: install.md,v 1.15 2002/05/20 16:53:57 krw Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -42,22 +42,12 @@
 # Machine-dependent install sets
 MDSETS=kernel
 MDFSTYPE=msdos
+MDXAPERTURE=2
 ARCH=ARCH
 
 md_set_term() {
 }
 
-md_questions() {
-	echo
-	ask "Do you expect to run the X Window System?" y
-	case "$resp" in
-	y*|Y*)
-		xfree86=y
-		;;
-	esac
-	echo
-}
-
 md_installboot() {
 	if [[ $disklabeltype = "HFS" ]]
 	then
@@ -73,14 +63,6 @@ md_installboot() {
 			echo "Failed, you will not be able to boot from /dev/${1}."
 		fi
 	fi
-	if [ "$xfree86" = y ]; then
-		echo
-		echo "Enabling machdep.allowaperture. Read xf86(4) for more information."
-		echo '1,$s/^#machdep\.allowaperture=2/machdep\.allowaperture=2	/
-w
-q' | ed /mnt/etc/sysctl.conf 2> /dev/null
-		echo
-	fi
 }
 
 md_init_mbr() {
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh
index 2c933961a57..51ba71f3780 100644
--- a/distrib/miniroot/install.sh
+++ b/distrib/miniroot/install.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: install.sh,v 1.101 2002/05/15 11:54:34 mpech Exp $
+#	$OpenBSD: install.sh,v 1.102 2002/05/20 16:53:57 krw Exp $
 #	$NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $
 #
 # Copyright (c) 1997-2002 Todd Miller, Theo de Raadt, Ken Westerback
@@ -308,12 +308,14 @@ while [ -z "$resp" ]; do
 done
 IFS=$_oifs
 
-md_questions
-
 install_sets $THESETS
 
-# Copy in configuration information and make devices in target root.
-cfgfiles="fstab hostname.* hosts myname mygate resolv.conf kbdtype"
+# Set machdep.apertureallowed if required. install_sets must be
+# done first so that /etc/sysctl.conf is available.
+set_machdep_apertureallowed
+	
+# Copy configuration files to /mnt/etc.
+cfgfiles="fstab hostname.* hosts myname mygate resolv.conf kbdtype sysctl.conf"
 
 echo
 if [ -f /etc/dhclient.conf ]; then
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 20a69eb28e6..0480f999e8e 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.sub,v 1.223 2002/05/20 02:45:08 krw Exp $
+#	$OpenBSD: install.sub,v 1.224 2002/05/20 16:53:57 krw Exp $
 #	$NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
 #
 # Copyright (c) 1997-2002 Todd Miller, Theo de Raadt, Ken Westerback
@@ -76,11 +76,12 @@
 #	md_set_term()		  - set up terminal
 #
 # The following variables can be provided if required:
-#	MDTERM     - 'vt220' assumed if not provided
-#	MDFSTYPE   - nothing assumed if not provided
-#	MDFSOPTS   - nothing assumed if not provided
-#	MDDISKDEVS - '/^[sw]d[0-9][0-9]* /s/ .*//p' assumed if not provided
-#	MDCDDEVS   - '/^cd[0-9][0-9]* /s/ .*//p'    assumed if not provided
+#	MDTERM      - 'vt220' assumed if not provided
+#	MDFSTYPE    - nothing assumed if not provided
+#	MDFSOPTS    - nothing assumed if not provided
+#	MDDISKDEVS  - '/^[sw]d[0-9][0-9]* /s/ .*//p' assumed if not provided
+#	MDCDDEVS    - '/^cd[0-9][0-9]* /s/ .*//p'    assumed if not provided
+#	MDXAPERTURE - if not empty, set machdep.allowaperture=value in sysctl.conf
 . install.md
 
 set_term() {
@@ -2124,6 +2125,19 @@ populateusrlocal() {
 	fi
 }
 
+set_machdep_apertureallowed() {
+	[ "$MDXAPERTURE" ] || return
+
+	ask "\nDo you expect to run the X Window System?" y
+	case $resp in
+	y*|Y*)
+		sed -e "/^#\(machdep\.allowaperture=${MDXAPERTURE}\)/s//\1	/" \
+			/mnt/etc/sysctl.conf > /tmp/sysctl.conf
+		echo "machdep.allowaperture enabled in /etc/sysctl.conf. Read xf86(4) for details."
+		;;
+	esac
+}
+
 finish_up() {
 	# Get timezone info
 	get_timezone
diff --git a/distrib/mvme68k/ramdisk/install.md b/distrib/mvme68k/ramdisk/install.md
index 54a73e23fc4..5662cd5bc9d 100644
--- a/distrib/mvme68k/ramdisk/install.md
+++ b/distrib/mvme68k/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.21 2002/05/19 16:16:05 krw Exp $
+#       $OpenBSD: install.md,v 1.22 2002/05/20 16:53:57 krw Exp $
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
@@ -46,10 +46,6 @@ ARCH=ARCH
 md_set_term() {
 }
 
-md_questions() {
-	:
-}
-
 md_installboot() {
 	echo Installing boot block...
 	cp /mnt/usr/mdec/bootsd /mnt/bootsd
diff --git a/distrib/mvme88k/ramdisk/install.md b/distrib/mvme88k/ramdisk/install.md
index 2d109931177..3da689c5f8c 100644
--- a/distrib/mvme88k/ramdisk/install.md
+++ b/distrib/mvme88k/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.16 2002/05/19 16:16:05 krw Exp $
+#       $OpenBSD: install.md,v 1.17 2002/05/20 16:53:57 krw Exp $
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
@@ -51,10 +51,6 @@ md_get_ifdevs() {
 	dmesg | egrep "(^ie[0-9] )|(^le[0-9] )" | cut -d" " -f1 | sort -u
 }
 
-md_questions() {
-	:
-}
-
 md_installboot() {
 	local _rawdev
 
diff --git a/distrib/mvmeppc/ramdisk/install.md b/distrib/mvmeppc/ramdisk/install.md
index b69256ca24b..946ade73d7d 100644
--- a/distrib/mvmeppc/ramdisk/install.md
+++ b/distrib/mvmeppc/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.13 2002/05/19 16:16:05 krw Exp $
+#	$OpenBSD: install.md,v 1.14 2002/05/20 16:53:57 krw Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -48,10 +48,6 @@ ARCH=ARCH
 md_set_term() {
 }
 
-md_questions() {
-	:
-}
-
 md_installboot() {
 	if [[ $disklabeltype = "HFS" ]]
 	then
diff --git a/distrib/sparc/install.md b/distrib/sparc/install.md
index dc129d31000..d130a70d880 100644
--- a/distrib/sparc/install.md
+++ b/distrib/sparc/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.42 2002/05/18 17:56:03 krw Exp $
+#	$OpenBSD: install.md,v 1.43 2002/05/20 16:53:57 krw Exp $
 #	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
 #
 #
@@ -49,10 +49,6 @@ ARCH=ARCH
 md_set_term() {
 }
 
-md_questions() {
-	:
-}
-
 md_installboot() {
 	local _rawdev _prefix
 
diff --git a/distrib/sparc64/common/install.md b/distrib/sparc64/common/install.md
index 01c892f5c8c..8cd823baf46 100644
--- a/distrib/sparc64/common/install.md
+++ b/distrib/sparc64/common/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.11 2002/05/18 17:56:03 krw Exp $
+#	$OpenBSD: install.md,v 1.12 2002/05/20 16:53:57 krw Exp $
 #	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
 #
 #
@@ -43,21 +43,12 @@
 # Machine-dependent install sets
 MDSETS=kernel
 MDTERM=sun
+MDXAPERTURE=1
 ARCH=ARCH
 
 md_set_term() {
 }
 
-md_questions() {
-	echo
-	ask "Do you expect to run the X Window System?" y
-	case "$resp" in
-	y*|Y*)	xfree86=y
-		;;
-	esac
-	echo
-}
-
 md_installboot() {
 	local _rawdev _prefix
 
@@ -91,14 +82,6 @@ md_installboot() {
 	fi
 	echo Copying ofwboot...
 	cp ${_prefix}/ofwboot /mnt/ofwboot
-	if [ "$xfree86" = y ]; then
-		echo
-		echo "Enabling machdep.allowaperture. Read xf86(4) for more information."
-		echo '1,$s/^#machdep\.allowaperture=1/machdep\.allowaperture=1	/
-w
-q' | ed /mnt/etc/sysctl.conf 2> /dev/null
-		echo
-	fi
 }
 
 md_checkfordisklabel() {
diff --git a/distrib/sun3/install.md b/distrib/sun3/install.md
index cfce566a5fb..2c96a2df0aa 100644
--- a/distrib/sun3/install.md
+++ b/distrib/sun3/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.10 2002/05/18 17:56:03 krw Exp $
+#	$OpenBSD: install.md,v 1.11 2002/05/20 16:53:57 krw Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -48,10 +48,6 @@ ARCH=ARCH
 md_set_term() {
 }
 
-md_questions() {
-	:
-}
-
 md_installboot() {
 	local _rawdev _prefix
 
diff --git a/distrib/vax/install.md b/distrib/vax/install.md
index 85234eb53d5..7f61706d657 100644
--- a/distrib/vax/install.md
+++ b/distrib/vax/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.15 2002/05/18 17:56:03 krw Exp $
+#	$OpenBSD: install.md,v 1.16 2002/05/20 16:53:57 krw Exp $
 #	$NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $
 #
 #
@@ -50,10 +50,6 @@ ARCH=ARCH
 md_set_term() {
 }
 
-md_questions() {
-	:
-}
-
 md_installboot() {
 	echo "Installing boot block..."
 	cp /mnt/usr/mdec/boot /mnt/boot