Fix some newfs usage.

7 files changed, 21 insertions, 21 deletions

diff --git a/distrib/alpha/ramdisk/Makefile b/distrib/alpha/ramdisk/Makefile
index 630a9088dc7..f2ad4eb82ec 100644
--- a/distrib/alpha/ramdisk/Makefile
+++ b/distrib/alpha/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.12 1997/09/05 21:16:42 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.13 1997/09/26 02:09:53 millert Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -44,8 +44,7 @@ ${FLOPPY}:	bsd.gz
 	dd if=/dev/zero of=${REALIMAGE} count=${FLOPPYBLKS}
 	vnconfig -v -c ${VND} ${REALIMAGE}
 	disklabel -w -r ${VND} ${FLOPPYTYPE}
-	newfs ${NEWFSARGS} ${NEWFSARGS_FD} -s ${FLOPPYBLKS} ${VND_RDEV} \
-	    ${FLOPPYTYPE}
+	newfs ${NEWFSARGS} ${NEWFSARGS_FD} -s ${FLOPPYBLKS} ${VND_RDEV}
 	mount ${VND_DEV} ${MOUNT_POINT}
 	cp ${BOOT} ${MOUNT_POINT}
 	cp bsd.gz ${MOUNT_POINT}/bsd
@@ -91,7 +90,7 @@ do_prep:
 	disklabel -w -r ${VND} ${DISKTYPE}
 	
 do_mount:
-	newfs ${NEWFSARGS} ${NEWFSARGS_RD} -s ${NBLKS} ${VND_RDEV} ${DISKTYPE}
+	newfs ${NEWFSARGS} ${NEWFSARGS_RD} -s ${NBLKS} ${VND_RDEV}
 	mount ${VND_DEV} ${MOUNT_POINT}
  
 do_umount:
diff --git a/distrib/hp300/ramdisk/Makefile b/distrib/hp300/ramdisk/Makefile
index 9079cfe869d..3dd9313abf2 100644
--- a/distrib/hp300/ramdisk/Makefile
+++ b/distrib/hp300/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 1997/09/05 21:16:48 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.7 1997/09/26 02:09:54 millert Exp $
 #	$NetBSD: Makefile,v 1.1 1995/07/18 04:13:06 briggs Exp $
 
 TOP=		${.CURDIR}/..
@@ -46,7 +46,7 @@ rd_setup: ${CBIN}
 	dd if=/dev/zero of=${REALIMAGE} bs=512 count=${NBLKS}
 	vnconfig -v -c ${VND} ${REALIMAGE}
 	disklabel -w -r ${VND} ${DISKTYPE}
-	newfs ${NEWFSARGS} ${VND_RDEV} ${DISKTYPE}
+	newfs ${NEWFSARGS} ${VND_RDEV}
 	fsck ${VND_RDEV}
 	mount ${VND_DEV} ${MOUNT_POINT}
 
diff --git a/distrib/i386/floppies/common/Makefile.inc b/distrib/i386/floppies/common/Makefile.inc
index 7d0d304133e..168a26eb4cc 100644
--- a/distrib/i386/floppies/common/Makefile.inc
+++ b/distrib/i386/floppies/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.5 1997/05/14 18:38:58 niklas Exp $
+#	$OpenBSD: Makefile.inc,v 1.6 1997/09/26 02:09:56 millert Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -27,12 +27,12 @@ all: ${CBIN}
 	dd if=/dev/zero of=${REALIMAGE} bs=10k count=120
 	vnconfig -v -c ${VND} ${REALIMAGE}
 	disklabel -w -B -b /usr/mdec/fdboot -s /usr/mdec/bootfd ${VND} floppy5
-	newfs -O -m 0 -o space -i 3000 -c 80 ${VND_RDEV} floppy5
+	newfs -O -m 0 -o space -i 3000 -c 80 ${VND_RDEV}
 .else
 	dd if=/dev/zero of=${REALIMAGE} bs=10k count=144
 	vnconfig -v -c ${VND} ${REALIMAGE}
 	disklabel -w -B -b /usr/mdec/fdboot -s /usr/mdec/bootfd ${VND} floppy3
-	newfs -O -m 0 -o space -i 3000 -c 80 ${VND_RDEV} floppy3
+	newfs -O -m 0 -o space -i 3000 -c 80 ${VND_RDEV}
 .endif
 	mount ${VND_DEV} ${MOUNT_POINT}
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
diff --git a/distrib/i386/floppies/kc/Makefile b/distrib/i386/floppies/kc/Makefile
index be360e4463e..2821e6c2619 100644
--- a/distrib/i386/floppies/kc/Makefile
+++ b/distrib/i386/floppies/kc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.16 1997/09/05 21:16:50 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.17 1997/09/26 02:09:55 millert Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -33,12 +33,12 @@ all: bsd ${CBIN}
 	dd if=/dev/zero of=${REALIMAGE} bs=10k count=120
 	vnconfig -v -c ${VND} ${REALIMAGE}
 	disklabel -w -B -b /usr/mdec/fdboot -s /usr/mdec/bootfd ${VND} floppy5
-	newfs -O -m 0 -o space -i 8192 -c 80 ${VND_RDEV} floppy5
+	newfs -O -m 0 -o space -i 8192 -c 80 ${VND_RDEV}
 .else
 	dd if=/dev/zero of=${REALIMAGE} bs=10k count=144
 	vnconfig -v -c ${VND} ${REALIMAGE}
 	disklabel -w -B -b /usr/mdec/fdboot -s /usr/mdec/bootfd ${VND} floppy3
-	newfs -O -m 0 -o space -i 6500 -c 80 ${VND_RDEV} floppy3
+	newfs -O -m 0 -o space -i 6500 -c 80 ${VND_RDEV}
 .endif
 	mount ${VND_DEV} ${MOUNT_POINT}
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
diff --git a/distrib/i386/floppies/ramdisk/Makefile b/distrib/i386/floppies/ramdisk/Makefile
index 068c26dfad2..9aef7e7bbc7 100644
--- a/distrib/i386/floppies/ramdisk/Makefile
+++ b/distrib/i386/floppies/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.25 1997/09/05 21:16:51 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.26 1997/09/26 02:09:57 millert Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -30,7 +30,7 @@ ${FS}:	bsd.gz
 	dd if=/dev/zero of=${REALIMAGE} bs=10k count=144
 	vnconfig -v -c ${VND} ${REALIMAGE}
 	disklabel -w -r ${VND} floppy3
-	newfs -m 0 -o space -i 524288 -c 80 ${VND_RDEV} floppy3
+	newfs -m 0 -o space -i 524288 -c 80 ${VND_RDEV}
 	mount ${VND_DEV} ${MOUNT_POINT}
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
 	    TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTFLOPPY}
@@ -70,7 +70,7 @@ rd_setup: ${CBIN}
 	dd if=/dev/zero of=${REALIMAGE} bs=512 count=${NBLKS}
 	vnconfig -v -c ${VND} ${REALIMAGE}
 	disklabel -w -r ${VND} ${DISKTYPE}
-	newfs ${NEWFSARGS} ${VND_RDEV} ${DISKTYPE}
+	newfs ${NEWFSARGS} ${VND_RDEV}
 	fsck ${VND_RDEV}
 	mount ${VND_DEV} ${MOUNT_POINT}
 
diff --git a/distrib/miniroot/Makefile b/distrib/miniroot/Makefile
index 9048c33e672..4ce687c4e1e 100644
--- a/distrib/miniroot/Makefile
+++ b/distrib/miniroot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.18 1997/09/21 11:45:56 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.19 1997/09/26 02:09:59 millert Exp $
 
 # Revision is 2.1
 REV=		21
@@ -44,8 +44,7 @@ all: ${CBIN} bsd
 	dd if=/dev/zero of=${REALIMAGE} count=${IMAGESIZE}
 	vnconfig -v -c ${VND} ${REALIMAGE}
 	disklabel -w ${RAWLABEL} ${VND} ${DISKTYPE}
-	newfs -m 0 -o space ${NEWFSOPTS} ${VND_RDEV} ${DISKTYPE} || \
-	    ${NEWFS_WILL_FAIL}
+	newfs -m 0 -o space ${NEWFSOPTS} ${VND_RDEV} || ${NEWFS_WILL_FAIL}
 	mount ${VND_DEV} ${MOUNT_POINT}
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	REV=${REV} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} ARCHDIR=${ARCHDIR} \
diff --git a/distrib/pc532/floppies/inst-common/Makefile.inc b/distrib/pc532/floppies/inst-common/Makefile.inc
index c6a1ef5c89c..de16a407fa1 100644
--- a/distrib/pc532/floppies/inst-common/Makefile.inc
+++ b/distrib/pc532/floppies/inst-common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.5 1997/05/14 18:39:04 niklas Exp $ 
+#	$OpenBSD: Makefile.inc,v 1.6 1997/09/26 02:10:00 millert Exp $ 
 #	$NetBSD: Makefile.inc,v 1.5.4.2 1996/08/07 07:29:42 phil Exp $ 
 
 # TOP is assumed to be defined by Makefile including this one.
@@ -30,7 +30,8 @@ all: netbsd
 	-yes|bim -c init -c "add ${MDEC}/boot boot" -c "default 0" \
 	    -c "exit" ${.OBJDIR}/${IMAGE} 2>/dev/null >/dev/null
 	vnconfig -v -c ${VND_DEV} ${IMAGE}
-	newfs -b 8192 -f 1024 -O -m 0 -o space -i 204800 -c 80 ${VND_RDEV} boot3
+	disklabel -w -r ${VND} boot3
+	newfs -b 8192 -f 1024 -O -m 0 -o space -i 204800 -c 80 ${VND_RDEV}
 	mount ${VND_DEV} ${MOUNT_POINT}
 	cp netbsd ${MOUNT_POINT}/netbsd
 	@df -i ${MOUNT_POINT}
@@ -44,7 +45,8 @@ inject.fs: ${CBIN} ${LISTS} netbsd.gz
 .ifndef SD
 	dd if=/dev/zero of=${.TARGET} bs=128k count=16
 	vnconfig -v -c ${VND_DEV} ${.TARGET}
-	newfs -b 8192 -f 1024 -O -m 0 -o space -i 7168 ${VND_RDEV} rd
+	disklabel -w -r ${VND} rd
+	newfs -b 8192 -f 1024 -O -m 0 -o space -i 7168 ${VND_RDEV}
 	mount ${VND_DEV} ${MOUNT_POINT}
 .else
 	newfs -b 8192 -f 1024 -O -m 0 -o space -i 7168 -s 4096 \