Make FFS2 the default filesystem type on installs except for landisk,

luna88k and sgi.

ok otto@ deraadt@ (for diff with same effect)

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."

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() {

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

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