diff options
-rw-r--r-- | distrib/alpha/ramdisk/install.md | 6 | ||||
-rw-r--r-- | distrib/amiga/install.md | 6 | ||||
-rw-r--r-- | distrib/arc/ramdisk/install.md | 6 | ||||
-rw-r--r-- | distrib/atari/miniroot/install.md | 4 | ||||
-rw-r--r-- | distrib/hp300/ramdisk/install.md | 6 | ||||
-rw-r--r-- | distrib/i386/floppies/common/install.md | 29 | ||||
-rw-r--r-- | distrib/mac68k/ramdisk/install.md | 6 | ||||
-rw-r--r-- | distrib/miniroot/install.sh | 4 | ||||
-rw-r--r-- | distrib/mvme68k/ramdisk/install.md | 8 | ||||
-rw-r--r-- | distrib/mvme88k/ramdisk/install.md | 6 | ||||
-rw-r--r-- | distrib/pmax/install.md | 6 | ||||
-rw-r--r-- | distrib/pmax/ramdisk/install.md | 6 | ||||
-rw-r--r-- | distrib/powerpc/ramdisk/install.md | 6 | ||||
-rw-r--r-- | distrib/sparc/install.md | 6 | ||||
-rw-r--r-- | distrib/sun3/common/install.md | 4 | ||||
-rw-r--r-- | distrib/sun3/ramdisk/install.md | 6 |
16 files changed, 90 insertions, 25 deletions
diff --git a/distrib/alpha/ramdisk/install.md b/distrib/alpha/ramdisk/install.md index 83a22e4a62a..9776ccca9dc 100644 --- a/distrib/alpha/ramdisk/install.md +++ b/distrib/alpha/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.32 1999/08/15 10:05:04 millert Exp $ +# $OpenBSD: install.md,v 1.33 1999/09/03 18:55:21 deraadt Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. @@ -82,6 +82,10 @@ md_get_partition_range() { echo [a-p] } +md_questions() { + : +} + md_installboot() { local _rawdev diff --git a/distrib/amiga/install.md b/distrib/amiga/install.md index fc69eeeb9c8..6ab29199b20 100644 --- a/distrib/amiga/install.md +++ b/distrib/amiga/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.8 1999/08/15 10:05:04 millert Exp $ +# $OpenBSD: install.md,v 1.9 1999/09/03 18:55:22 deraadt Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -92,6 +92,10 @@ md_get_partition_range() { echo "[a-p]" } +md_questions() { + : +} + md_installboot() { # Nothing needed } diff --git a/distrib/arc/ramdisk/install.md b/distrib/arc/ramdisk/install.md index 7465a81b38d..aa7c9e6b9de 100644 --- a/distrib/arc/ramdisk/install.md +++ b/distrib/arc/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.12 1999/08/15 10:05:06 millert Exp $ +# $OpenBSD: install.md,v 1.13 1999/09/03 18:55:23 deraadt Exp $ # # # Copyright rc) 1996 The NetBSD Foundation, Inc. @@ -79,6 +79,10 @@ md_get_partition_range() { echo "[a-p]" } +md_questions() { + : +} + md_installboot() { local model diff --git a/distrib/atari/miniroot/install.md b/distrib/atari/miniroot/install.md index 027a0e3dddf..5fe57f1a4c7 100644 --- a/distrib/atari/miniroot/install.md +++ b/distrib/atari/miniroot/install.md @@ -104,6 +104,10 @@ md_get_partition_range() { echo '[a-p]' } +md_questions() { + : +} + md_installboot() { if [ -x /mnt/usr/mdec/installboot ]; then echo -n "Should a boot block be installed? [y] " diff --git a/distrib/hp300/ramdisk/install.md b/distrib/hp300/ramdisk/install.md index 368624793a1..98254e34fbe 100644 --- a/distrib/hp300/ramdisk/install.md +++ b/distrib/hp300/ramdisk/install.md @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: install.md,v 1.18 1999/08/15 10:05:04 millert Exp $ +# $OpenBSD: install.md,v 1.19 1999/09/03 18:55:26 deraadt Exp $ # $NetBSD: install.md,v 1.1.2.4 1996/08/26 15:45:14 gwr Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -127,6 +127,10 @@ md_get_partition_range() { echo "[a-p]" } +md_questions() { + : +} + md_installboot() { # $1 is the root disk 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 } diff --git a/distrib/mac68k/ramdisk/install.md b/distrib/mac68k/ramdisk/install.md index 90213a40487..65a040b49c8 100644 --- a/distrib/mac68k/ramdisk/install.md +++ b/distrib/mac68k/ramdisk/install.md @@ -1,6 +1,6 @@ #!/bin/sh # -# $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:28 deraadt Exp $ # $NetBSD: install.md,v 1.1.2.4 1996/08/26 15:45:14 gwr Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -126,6 +126,10 @@ md_get_partition_range() { echo "[a-p]" } +md_questions() { + : +} + md_installboot() { : } diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index c1b2214b772..e8443f23824 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sh,v 1.57 1999/09/03 18:54:03 deraadt Exp $ +# $OpenBSD: install.sh,v 1.58 1999/09/03 18:55:29 deraadt Exp $ # $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $ # # Copyright (c) 1997,1998 Todd Miller, Theo de Raadt @@ -534,6 +534,8 @@ while [ "X${resp}" = X"" ]; do fi done +md_questions + install_sets $THESETS # Copy in configuration information and make devices in target root. diff --git a/distrib/mvme68k/ramdisk/install.md b/distrib/mvme68k/ramdisk/install.md index 6c159ce4987..1662dd90dfb 100644 --- a/distrib/mvme68k/ramdisk/install.md +++ b/distrib/mvme68k/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.7 1999/08/15 10:05:06 millert Exp $ +# $OpenBSD: install.md,v 1.8 1999/09/03 18:55:30 deraadt Exp $ # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. # @@ -77,14 +77,18 @@ md_get_partition_range() { echo "[a-p]" } +md_questions() { + : +} + md_installboot() { echo "Nothing to do." } + md_labeldisk() { echo "huh" } - md_checkfordisklabel() { # $1 is the disk to check local rval diff --git a/distrib/mvme88k/ramdisk/install.md b/distrib/mvme88k/ramdisk/install.md index c031bc25bfe..bce0dd60209 100644 --- a/distrib/mvme88k/ramdisk/install.md +++ b/distrib/mvme88k/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.3 1999/08/15 10:05:07 millert Exp $ +# $OpenBSD: install.md,v 1.4 1999/09/03 18:55:32 deraadt Exp $ # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. # @@ -74,6 +74,10 @@ md_get_partition_range() { echo "[a-p]" } +md_questions() { + : +} + md_installboot() { local _rawdev diff --git a/distrib/pmax/install.md b/distrib/pmax/install.md index 4140bb4f318..f696d4c4aa2 100644 --- a/distrib/pmax/install.md +++ b/distrib/pmax/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.12 1999/08/15 10:05:07 millert Exp $ +# $OpenBSD: install.md,v 1.13 1999/09/03 18:55:33 deraadt Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -120,6 +120,10 @@ md_get_partition_range() { } +md_questions() { + : +} + md_installboot() { # $1 is the root disk diff --git a/distrib/pmax/ramdisk/install.md b/distrib/pmax/ramdisk/install.md index 96430ef8595..1f2648a34db 100644 --- a/distrib/pmax/ramdisk/install.md +++ b/distrib/pmax/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.5 1999/08/15 10:05:07 millert Exp $ +# $OpenBSD: install.md,v 1.6 1999/09/03 18:55:34 deraadt Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. @@ -86,6 +86,10 @@ md_get_partition_range() { echo "[a-p]" } +md_questions() { + : +} + md_installboot() { # $1 is the root disk diff --git a/distrib/powerpc/ramdisk/install.md b/distrib/powerpc/ramdisk/install.md index 1489b57d127..aef2280b85b 100644 --- a/distrib/powerpc/ramdisk/install.md +++ b/distrib/powerpc/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.11 1999/08/15 10:05:07 millert Exp $ +# $OpenBSD: install.md,v 1.12 1999/09/03 18:55:35 deraadt Exp $ # # # Copyright rc) 1996 The NetBSD Foundation, Inc. @@ -75,6 +75,10 @@ md_get_partition_range() { echo "[a-p]" } +md_questions() { + : +} + md_installboot() { echo "Installing boot in the msdos partition /dev/${1}i" if mount -t msdos /dev/${1}i /mnt2 ; then diff --git a/distrib/sparc/install.md b/distrib/sparc/install.md index 11116c6dfae..06f143e3c75 100644 --- a/distrib/sparc/install.md +++ b/distrib/sparc/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.28 1999/08/15 10:05:05 millert Exp $ +# $OpenBSD: install.md,v 1.29 1999/09/03 18:55:36 deraadt Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -125,6 +125,10 @@ md_get_partition_range() { echo [a-p] } +md_questions() { + : +} + md_installboot() { local _rawdev _prefix diff --git a/distrib/sun3/common/install.md b/distrib/sun3/common/install.md index f806729d632..8ac7725ed2d 100644 --- a/distrib/sun3/common/install.md +++ b/distrib/sun3/common/install.md @@ -104,6 +104,10 @@ md_get_partition_range() { echo '[a-h]' } +md_questions() { + : +} + md_installboot() { # install the boot block on disk $1 echo "Installing boot block..." diff --git a/distrib/sun3/ramdisk/install.md b/distrib/sun3/ramdisk/install.md index e787feb2a89..01f1fdc1abb 100644 --- a/distrib/sun3/ramdisk/install.md +++ b/distrib/sun3/ramdisk/install.md @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: install.md,v 1.6 1999/08/15 10:05:06 millert Exp $ +# $OpenBSD: install.md,v 1.7 1999/09/03 18:55:40 deraadt Exp $ # $NetBSD: install.md,v 1.1.2.4 1996/08/26 15:45:14 gwr Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -126,6 +126,10 @@ md_get_partition_range() { echo "[a-p]" } +md_questions() { + : +} + md_installboot() { # $1 is the root disk |