summaryrefslogtreecommitdiff
path: root/distrib/i386/floppies
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1999-09-03 18:55:41 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1999-09-03 18:55:41 +0000
commit877cf68f28da81f5fc0d1e5dcc65db77f4d2f910 (patch)
tree937b0b93c0b2cf722a45e72fed999daf5380ee5b /distrib/i386/floppies
parentfb3edef16dedb8f8c8e275c4459863cf406b8c03 (diff)
md_questions() interface allows asking questions before sets
Diffstat (limited to 'distrib/i386/floppies')
-rw-r--r--distrib/i386/floppies/common/install.md29
1 files changed, 18 insertions, 11 deletions
diff --git a/distrib/i386/floppies/common/install.md b/distrib/i386/floppies/common/install.md
index fb77fd05f30..64a8873dd8b 100644
--- a/distrib/i386/floppies/common/install.md
+++ b/distrib/i386/floppies/common/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.2 1999/08/15 10:05:05 millert Exp $
+# $OpenBSD: install.md,v 1.3 1999/09/03 18:55:27 deraadt Exp $
#
#
# Copyright rc) 1996 The NetBSD Foundation, Inc.
@@ -74,21 +74,13 @@ md_get_partition_range() {
echo [a-p]
}
-md_installboot() {
- echo Installing boot block...
- cp /usr/mdec/boot /mnt/boot
- /usr/mdec/installboot -v /mnt/boot /usr/mdec/biosboot ${1}
-
+md_questions() {
echo
echo -n "Do you expect to run the X Window System on this machine? [y or n] "
getresp n
case "$resp" in
y*|Y*)
- 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
-
+ xfree86=y
;;
*)
;;
@@ -96,6 +88,21 @@ q' | ed /mnt/etc/sysctl.conf 2> /dev/null
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=1/machdep\.allowaperture=1 /
+w
+q' | ed /mnt/etc/sysctl.conf 2> /dev/null
+ echo
+ fi
+}
+
md_native_fstype() {
echo msdos
}