diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2020-04-05 15:15:43 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2020-04-05 15:15:43 +0000 |
| commit | b85a39384af7f29bbcadc18012197e996428eae0 (patch) | |
| tree | 6bb4666ecde215e8b76f90ac471e9f0711fe227b | |
| parent | 5bbe3ca0575585a8b8930708a065ad77534f46e5 (diff) | |
Make FFS2 the default filesystem type on installs except for landisk,
luna88k and sgi.
ok otto@ deraadt@ (for diff with same effect)
| -rw-r--r-- | distrib/landisk/ramdisk/install.md | 6 | ||||
| -rw-r--r-- | distrib/luna88k/ramdisk/install.md | 5 | ||||
| -rw-r--r-- | distrib/miniroot/install.sub | 17 | ||||
| -rw-r--r-- | distrib/sgi/ramdisk/install.md | 6 |
4 files changed, 22 insertions, 12 deletions
diff --git a/distrib/landisk/ramdisk/install.md b/distrib/landisk/ramdisk/install.md index 48824513d6e..d320cc02b7f 100644 --- a/distrib/landisk/ramdisk/install.md +++ b/distrib/landisk/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.43 2017/01/22 23:43:54 rpe Exp $ +# $OpenBSD: install.md,v 1.44 2020/04/05 15:15:42 krw Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. @@ -31,6 +31,10 @@ # machine dependent section of installation/upgrade script. # +# FFS2 not supported, use FFS1 +MDFSOPT=-O1 +MDROOTFSOPT=-O1 + md_installboot() { if ! installboot -r /mnt ${1}; then echo "\nFailed to install bootblocks." diff --git a/distrib/luna88k/ramdisk/install.md b/distrib/luna88k/ramdisk/install.md index 7c6143e8b7e..a41bef45906 100644 --- a/distrib/luna88k/ramdisk/install.md +++ b/distrib/luna88k/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.25 2017/07/28 18:15:44 rpe Exp $ +# $OpenBSD: install.md,v 1.26 2020/04/05 15:15:42 krw Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. @@ -32,7 +32,8 @@ # MDTERM=vt100 -MDROOTFSOPT="-f 1024 -b 8192" +MDFSOPT=-O1 +MDROOTFSOPT="-f 1024 -b 8192 -O1" NCPU=$(sysctl -n hw.ncpufound) md_installboot() { diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 68ae5cdd48a..9a590d22c2d 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.1149 2020/03/06 21:14:20 gkoehler Exp $ +# $OpenBSD: install.sub,v 1.1150 2020/04/05 15:15:42 krw Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -505,11 +505,12 @@ configure_disk() { while read _pp _mp _fstype _rest; do [[ $_fstype == ffs ]] || continue - # Use machine-dependent newfs options for the root - # partition if defined. - _opt=$MDFSOPT - [[ $_mp == / ]] && _opt=$MDROOTFSOPT - + # Default to FFS2 unless otherwise directed. + if [[ $_mp == / ]]; then + _opt=${MDROOTFSOPT:--O2} + else + _opt=${MDFSOPT:--O2} + fi newfs -q $_opt ${_pp##/dev/} # N.B.: '!' is lexically < '/'. @@ -3328,8 +3329,8 @@ umount -af >/dev/null 2>&1 # # The following variables can be provided if required: # MDEFI - set to 'y' on archs that support GPT partitioning -# MDFSOPT - newfs options for non-root partitions -# MDROOTFSOPT - newfs options for the root partition +# MDFSOPT - newfs options for non-root partitions, '-O2' assumed if not provided +# MDROOTFSOPT - newfs options for the root partition, '-O2' assumed if not provided # MDSETS - list of files to add to DEFAULT and ALLSETS # MDSANESETS - list of files to add to SANESETS # MDTERM - 'vt220' assumed if not provided diff --git a/distrib/sgi/ramdisk/install.md b/distrib/sgi/ramdisk/install.md index c5ecd946340..34993b7bb06 100644 --- a/distrib/sgi/ramdisk/install.md +++ b/distrib/sgi/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.44 2017/07/28 18:15:44 rpe Exp $ +# $OpenBSD: install.md,v 1.45 2020/04/05 15:15:42 krw Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. @@ -35,6 +35,10 @@ IPARCH=$(sysctl -n hw.model) NCPU=$(sysctl -n hw.ncpufound) MDKERNEL=GENERIC-$IPARCH +# FFS2 not supported, use FFS1 +MDFSOPT=-O1 +MDROOTFSOPT=-O1 + MDSETS="bsd.$IPARCH bsd.rd.$IPARCH" MDSANESETS=bsd.$IPARCH if ((NCPU > 1)); then |