Use svnds and remove ugly cache flushing

3 files changed, 6 insertions, 17 deletions

diff --git a/distrib/i386/floppies/common/Makefile.inc b/distrib/i386/floppies/common/Makefile.inc
index 18105086044..7d0d304133e 100644
--- a/distrib/i386/floppies/common/Makefile.inc
+++ b/distrib/i386/floppies/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.4 1997/05/11 20:01:56 millert Exp $
+#	$OpenBSD: Makefile.inc,v 1.5 1997/05/14 18:38:58 niklas Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -6,7 +6,7 @@ CBIN=		instbin
 COMMONDIR=	${TOP}/inst-common
 
 MOUNT_POINT?=	/mnt
-VND?=		vnd0
+VND?=		svnd0
 VND_DEV=	/dev/${VND}a
 VND_RDEV=	/dev/r${VND}a
 IMAGE?=		xxx${REV}.fs
@@ -43,7 +43,6 @@ all: ${CBIN}
 	@echo ""
 	umount ${MOUNT_POINT}
 	vnconfig -u ${VND}
-	cat /*bin/* > /dev/null
 	cp ${REALIMAGE} ${IMAGE}
 	rm ${REALIMAGE}
 
diff --git a/distrib/i386/floppies/kc/Makefile b/distrib/i386/floppies/kc/Makefile
index 3fb30215943..84d52100c06 100644
--- a/distrib/i386/floppies/kc/Makefile
+++ b/distrib/i386/floppies/kc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.14 1997/05/11 20:01:55 millert Exp $
+#	$OpenBSD: Makefile,v 1.15 1997/05/14 18:38:59 niklas Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -6,7 +6,7 @@ TOP=		${.CURDIR}/..
 IMAGE=		kc${REV}.fs
 CBIN=		kcbin
 MOUNT_POINT?=	/mnt
-VND?=		vnd0
+VND?=		svnd0
 VND_DEV=	/dev/${VND}a
 VND_RDEV=	/dev/r${VND}a
 IMAGE?=		xxx-${REV}.fs
@@ -49,7 +49,6 @@ all: bsd ${CBIN}
 	@echo ""
 	umount ${MOUNT_POINT}
 	vnconfig -u ${VND}
-	cat /*bin/* > /dev/null
 	cp ${REALIMAGE} ${IMAGE}
 	rm ${REALIMAGE}
 
diff --git a/distrib/i386/floppies/ramdisk/Makefile b/distrib/i386/floppies/ramdisk/Makefile
index 8922e5b3bd3..914969769e3 100644
--- a/distrib/i386/floppies/ramdisk/Makefile
+++ b/distrib/i386/floppies/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.18 1997/05/11 20:01:57 millert Exp $
+#	$OpenBSD: Makefile,v 1.19 1997/05/14 18:39:00 niklas Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -12,7 +12,7 @@ MOUNT_POINT=	/mnt
 MTREE=		${.CURDIR}/mtree.conf
 
 FS=		floppy.fs
-VND?=		vnd0
+VND?=		svnd0
 VND_DEV=	/dev/${VND}a
 VND_RDEV=	/dev/r${VND}a
 VND_CRDEV=	/dev/r${VND}c
@@ -31,15 +31,9 @@ ${FS}:	bsd.gz
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
 	    TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTFLOPPY}
 	/usr/mdec/installboot -v ${MOUNT_POINT}/boot ${DESTDIR}/usr/mdec/biosboot ${VND_CRDEV}
-	sync
-	cat /*bin/* > /dev/null
-	sync
 	@echo ""
 	@df -i ${MOUNT_POINT}
 	@echo ""
-	sync
-	cat /*bin/* > /dev/null
-	sync
 	umount ${MOUNT_POINT}
 	vnconfig -u ${VND}
 	cp ${REALIMAGE} ${FS}
@@ -77,9 +71,6 @@ rd_setup: ${CBIN}
 
 rd_teardown:
 	@df -i ${MOUNT_POINT}
-	sync
-	cat /*bin/* > /dev/null
-	sync
 	-umount ${MOUNT_POINT}
 	-vnconfig -u ${VND}
 	cp ${REALIMAGE} ${IMAGE}