Don't specify disktype to newfs when we already have a label.

7 files changed, 17 insertions, 17 deletions

diff --git a/distrib/arc/common/Makefile.inc b/distrib/arc/common/Makefile.inc
index a05d1d3db5c..099423b3c08 100644
--- a/distrib/arc/common/Makefile.inc
+++ b/distrib/arc/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.2 1997/05/14 21:25:13 niklas Exp $
+#	$OpenBSD: Makefile.inc,v 1.3 1997/09/26 02:20:40 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/arc/floppies/kernel/Makefile b/distrib/arc/floppies/kernel/Makefile
index e09ee270813..ad4143378b2 100644
--- a/distrib/arc/floppies/kernel/Makefile
+++ b/distrib/arc/floppies/kernel/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 1997/09/05 21:16:44 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.5 1997/09/26 02:20:39 millert Exp $
 
 .include "../Makefile.inc"
 
@@ -21,9 +21,9 @@ bsd:
 
 all:	bsd
 	dd if=/dev/zero of=${REALIMAGE} bs=10k count=144
-	vnconfig -v -c ${VND_DEV} ${REALIMAGE}
-	#disklabel -w ${VND_RDEV} floppy
-	newfs -O -m 0 -o space -i 8192 -c 80 ${VND_RDEV} floppy
+	vnconfig -v -c ${VND} ${REALIMAGE}
+	disklabel -w ${VND} floppy
+	newfs -O -m 0 -o space -i 8192 -c 80 ${VND_RDEV}
 	mount ${VND_DEV} ${MOUNT_POINT}
 	TOPDIR=${.CURDIR}/.. CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
 	    TARGDIR=${MOUNT_POINT} sh ${.CURDIR}/../runlist.sh ${LISTS}
diff --git a/distrib/arc/ramdisk/Makefile b/distrib/arc/ramdisk/Makefile
index c1c365f710b..a32371e5c33 100644
--- a/distrib/arc/ramdisk/Makefile
+++ b/distrib/arc/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 1997/09/05 21:16:46 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.8 1997/09/26 02:20:41 millert Exp $
 
 # NOTE! We don't do crunched yet!
 
@@ -55,7 +55,7 @@ rd_setup:
 	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/mvme68k/ramdisk/Makefile b/distrib/mvme68k/ramdisk/Makefile
index c6cc5bf823f..7aca1c06df0 100644
--- a/distrib/mvme68k/ramdisk/Makefile
+++ b/distrib/mvme68k/ramdisk/Makefile
@@ -27,7 +27,7 @@ all:	bsd.rd
 #	dd if=/dev/zero of=${REALIMAGE} count=4096
 #	vnconfig -v -c ${VND} ${REALIMAGE}
 #	disklabel -w ${VND} rdroot
-#	newfs -m 0 -o space -i 8192 -c 80 ${VND_RDEV} rdroot
+#	newfs -m 0 -o space -i 8192 -c 80 ${VND_RDEV}
 #	mount ${VND_DEV} ${MOUNT_POINT}
 #	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
 #	    TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTFLOPPY}
@@ -63,7 +63,7 @@ rd_setup: ${CBIN}
 	dd if=/dev/zero of=${REALIMAGE} bs=512 count=${NBLKS}
 	vnconfig -v -c ${VND} ${REALIMAGE}
 	disklabel -w ${VND} ${DISKTYPE}
-	newfs ${NEWFSARGS} ${VND_RDEV} ${DISKTYPE}
+	newfs ${NEWFSARGS} ${VND_RDEV}
 	fsck ${VND_RDEV}
 	mount ${VND_DEV} ${MOUNT_POINT}
 
diff --git a/distrib/powerpc/miniroot/Makefile b/distrib/powerpc/miniroot/Makefile
index 7405f07edf6..c7f10acbfd5 100644
--- a/distrib/powerpc/miniroot/Makefile
+++ b/distrib/powerpc/miniroot/Makefile
@@ -45,7 +45,7 @@ do_prep: ${CBIN} do_unconfig
 	disklabel -w ${CDEV} ${DISKTYPE}
 	
 do_mount:
-	-newfs ${NEWFSARGS} -s ${NBLKS} ${CDEV} ${DISKTYPE}
+	-newfs ${NEWFSARGS} -s ${NBLKS} ${CDEV}
 	mount ${BDEV} ${MOUNT_POINT}
  
 do_umount_copy:
diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile
index 15caee224cb..eb590a066e0 100644
--- a/distrib/ramdisk/Makefile
+++ b/distrib/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 1997/09/21 11:46:01 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.9 1997/09/26 02:20:45 millert Exp $
 
 # Revision is 2.1
 REV=		21
@@ -58,7 +58,7 @@ ${FLOPPY}:	bsd.gz ${BOOT} ${BOOTXX}
 	dd if=/dev/zero of=${REALIMAGE} count=${FLOPPYSIZE}
 	vnconfig -v -c ${VND} ${REALIMAGE}
 	disklabel -w ${RAWLABEL} ${VND} ${FLOPPYTYPE}
-	newfs ${NEWFSOPTS_FD} ${VND_RDEV} ${FLOPPYTYPE}
+	newfs ${NEWFSOPTS_FD} ${VND_RDEV}
 	mount ${VND_DEV} ${MOUNT_POINT}
 	cp ${BOOT} ${MOUNT_POINT}/boot
 	cp bsd.gz ${MOUNT_POINT}/bsd
@@ -93,7 +93,7 @@ ${IMAGE}: ${CBIN}
 	dd if=/dev/zero of=${REALIMAGE} count=${IMAGESIZE}
 	vnconfig -v -c ${VND} ${REALIMAGE}
 	disklabel -w ${RAWLABEL} ${VND} ${DISKTYPE}
-	newfs ${NEWFSOPTS_RD} ${VND_RDEV} ${DISKTYPE} || ${NEWFS_WILL_FAIL}
+	newfs ${NEWFSOPTS_RD} ${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/simpleroot/Makefile b/distrib/simpleroot/Makefile
index 3a43b3b1699..0c44dcb4690 100644
--- a/distrib/simpleroot/Makefile
+++ b/distrib/simpleroot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 1997/05/15 12:33:06 graichen Exp $
+#	$OpenBSD: Makefile,v 1.9 1997/09/26 02:20:44 millert Exp $
 
 # Revision is 2.1
 REV=		21
@@ -35,7 +35,7 @@ all:
 .ifdef BOOT_DISKLABEL
 	disklabel -B ${BOOT_DISKLABEL} ${VND} ${DISKTYPE}
 .endif
-	newfs ${NEWFSOPTS} ${VND_RDEV} ${DISKTYPE}
+	newfs ${NEWFSOPTS} ${VND_RDEV}
 	mount ${VND_DEV} ${MOUNT_POINT}
 .ifdef BOOT_INSTALLBOOT
 	/usr/mdec/installboot -v ${MOUNT_POINT}/boot ${BOOT_INSTALLBOOT} ${VND}