diff options
-rw-r--r-- | distrib/alpha/ramdisk/Makefile | 12 | ||||
-rw-r--r-- | distrib/amiga/floppies/inst-common/Makefile.inc | 4 | ||||
-rw-r--r-- | distrib/arc/floppies/inst-common/Makefile.inc | 5 | ||||
-rw-r--r-- | distrib/arc/floppies/kernel/Makefile | 5 | ||||
-rw-r--r-- | distrib/arm32/floppies/inst-common/Makefile.inc | 4 | ||||
-rw-r--r-- | distrib/atari/inst-common/Makefile.inc | 3 | ||||
-rw-r--r-- | distrib/atari/miniroot/Makefile.inc | 3 | ||||
-rw-r--r-- | distrib/hp300/ramdisk/Makefile | 7 | ||||
-rw-r--r-- | distrib/i386/floppies/common/Makefile.inc | 5 | ||||
-rw-r--r-- | distrib/i386/floppies/kc/Makefile | 5 | ||||
-rw-r--r-- | distrib/i386/floppies/ramdisk/Makefile | 13 | ||||
-rw-r--r-- | distrib/mac68k/inst-common/Makefile.inc | 3 | ||||
-rw-r--r-- | distrib/miniroot/Makefile | 5 | ||||
-rw-r--r-- | distrib/mvme68k/ramdisk/Makefile | 12 | ||||
-rw-r--r-- | distrib/pc532/floppies/inst-common/Makefile.inc | 3 | ||||
-rw-r--r-- | distrib/simpleroot/Makefile | 5 | ||||
-rw-r--r-- | distrib/sparc/floppies/inst-common/Makefile.inc | 5 | ||||
-rw-r--r-- | distrib/sparc/floppies/kernel/Makefile | 5 | ||||
-rw-r--r-- | distrib/vax/inst-common/Makefile.inc | 4 |
19 files changed, 40 insertions, 68 deletions
diff --git a/distrib/alpha/ramdisk/Makefile b/distrib/alpha/ramdisk/Makefile index 595bc853bfb..38f4aed18e1 100644 --- a/distrib/alpha/ramdisk/Makefile +++ b/distrib/alpha/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 1997/05/14 11:32:22 graichen Exp $ +# $OpenBSD: Makefile,v 1.10 1997/05/14 18:38:50 niklas Exp $ TOP= ${.CURDIR}/.. @@ -10,7 +10,7 @@ KERNEL= ${TOP}/../../sys/arch/${MACHINE}/compile/RAMDISK/bsd MOUNT_POINT= /mnt -VND?= vnd0 +VND?= svnd0 VND_DEV= /dev/${VND}a VND_RDEV= /dev/r${VND}a VND_CRDEV= /dev/r${VND}c @@ -47,16 +47,13 @@ ${FLOPPY}: bsd.gz disklabel -w -r ${VND} ${FLOPPYTYPE} newfs ${NEWFSARGS} ${NEWFSARGS_FD} -s ${FLOPPYBLKS} ${VND_RDEV} \ ${FLOPPYTYPE} - cat /*bin/* > /dev/null mount ${VND_DEV} ${MOUNT_POINT} cp ${BOOT} ${MOUNT_POINT} cp bsd.gz ${MOUNT_POINT}/bsd - cat /*bin/* > /dev/null ${INSTALLBOOT} ${MOUNT_POINT}/boot ${BOOTXX} ${VND_CRDEV} @echo "" @df -i ${MOUNT_POINT} @echo "" - cat /*bin/* > /dev/null @cmp ${BOOT} ${MOUNT_POINT}/boot || echo "Warning! /boot corrupted!!!" @cmp bsd.gz ${MOUNT_POINT}/bsd || echo "Warning! /bsd corrupted!!!" umount ${MOUNT_POINT} @@ -96,15 +93,12 @@ do_umount: @echo "" @df -i ${MOUNT_POINT} @echo "" - cat /*bin/* > /dev/null umount ${MOUNT_POINT} vnconfig -u ${VND} - cat /*bin/* > /dev/null unconfig: - -cat /*bin/* > /dev/null -umount ${MOUNT_POINT} - -vnconfig -u ${VND} && cat /*bin/* > /dev/null + -vnconfig -u ${VND} beforeinstall: cp ${FLOPPY} ${DESTDIR}/snapshot diff --git a/distrib/amiga/floppies/inst-common/Makefile.inc b/distrib/amiga/floppies/inst-common/Makefile.inc index a9a11c3269e..ec30dc72c70 100644 --- a/distrib/amiga/floppies/inst-common/Makefile.inc +++ b/distrib/amiga/floppies/inst-common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.5 1996/10/10 06:38:50 niklas Exp $ +# $OpenBSD: Makefile.inc,v 1.6 1997/05/14 18:38:51 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}c VND_RDEV= /dev/r${VND}c IMAGE?= xxx-${REV}.fs diff --git a/distrib/arc/floppies/inst-common/Makefile.inc b/distrib/arc/floppies/inst-common/Makefile.inc index 89e8c1a9c60..7e5b553414f 100644 --- a/distrib/arc/floppies/inst-common/Makefile.inc +++ b/distrib/arc/floppies/inst-common/Makefile.inc @@ -1,4 +1,4 @@ -# $Id: Makefile.inc,v 1.2 1997/05/11 20:02:00 millert Exp $ +# $OpenBSD: Makefile.inc,v 1.3 1997/05/14 18:38:52 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}c VND_RDEV= /dev/r${VND}c PID!= echo $$$$ @@ -29,7 +29,6 @@ all: ${CBIN} df -i ${MOUNT_POINT} umount ${MOUNT_POINT} vnconfig -u ${VND_DEV} - cat /bin/* > /dev/null # flush buffer cache (yuck) cp ${REALIMAGE} ${IMAGE} rm ${REALIMAGE} diff --git a/distrib/arc/floppies/kernel/Makefile b/distrib/arc/floppies/kernel/Makefile index 079417008cc..9f286de8235 100644 --- a/distrib/arc/floppies/kernel/Makefile +++ b/distrib/arc/floppies/kernel/Makefile @@ -1,9 +1,9 @@ -# $Id: Makefile,v 1.2 1997/05/11 20:02:01 millert Exp $ +# $OpenBSD: Makefile,v 1.3 1997/05/14 18:38:53 niklas Exp $ .include "../Makefile.inc" MOUNT_POINT?= /mnt -VND?= vnd0 +VND?= svnd0 VND_DEV= /dev/${VND}c VND_RDEV= /dev/r${VND}c IMAGE= kc${REV}.fs @@ -33,7 +33,6 @@ all: bsd df -i ${MOUNT_POINT} umount ${MOUNT_POINT} vnconfig -u ${VND_DEV} - cat /bin/* > /dev/null # flush buffer cache (yuck) cp ${REALIMAGE} ${IMAGE} rm ${REALIMAGE} diff --git a/distrib/arm32/floppies/inst-common/Makefile.inc b/distrib/arm32/floppies/inst-common/Makefile.inc index cbde1681f24..dc9237bb389 100644 --- a/distrib/arm32/floppies/inst-common/Makefile.inc +++ b/distrib/arm32/floppies/inst-common/Makefile.inc @@ -1,3 +1,4 @@ +# $OpenBSD: Makefile.inc,v 1.2 1997/05/14 18:38:54 niklas Exp $ # $NetBSD: Makefile.inc,v 1.1 1996/05/16 19:59:03 mark Exp $ # TOP is assumed to be defined by Makefile including this one. @@ -6,7 +7,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 @@ -29,7 +30,6 @@ all: ${CBIN} @echo "" umount ${MOUNT_POINT} vnconfig -u ${VND_DEV} - cat /*bin/* > /dev/null unconfig: -umount -f ${MOUNT_POINT} diff --git a/distrib/atari/inst-common/Makefile.inc b/distrib/atari/inst-common/Makefile.inc index a18dc367103..9039e21d681 100644 --- a/distrib/atari/inst-common/Makefile.inc +++ b/distrib/atari/inst-common/Makefile.inc @@ -1,4 +1,5 @@ # +# $OpenBSD: Makefile.inc,v 1.3 1997/05/14 18:38:55 niklas Exp $ # $NetBSD: Makefile.inc,v 1.1.1.1 1995/04/17 19:08:50 leo Exp $ # @@ -8,7 +9,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 diff --git a/distrib/atari/miniroot/Makefile.inc b/distrib/atari/miniroot/Makefile.inc index 554aeac27fb..862d4a19316 100644 --- a/distrib/atari/miniroot/Makefile.inc +++ b/distrib/atari/miniroot/Makefile.inc @@ -1,5 +1,6 @@ +# $OpenBSD: Makefile.inc,v 1.3 1997/05/14 18:38:56 niklas Exp $ # $NetBSD: Makefile.inc,v 1.1 1996/05/27 12:49:53 leo Exp $ -VND= vnd0 +VND= svnd0 IMAGESIZE?= 2160 # 512 byte blocks NEWFSOPTS?= -i 3052 -c 60 diff --git a/distrib/hp300/ramdisk/Makefile b/distrib/hp300/ramdisk/Makefile index 8c18b4c53ef..574b89af86b 100644 --- a/distrib/hp300/ramdisk/Makefile +++ b/distrib/hp300/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 1997/05/11 20:01:54 millert Exp $ +# $OpenBSD: Makefile,v 1.5 1997/05/14 18:38:57 niklas Exp $ # $NetBSD: Makefile,v 1.1 1995/07/18 04:13:06 briggs Exp $ TOP= ${.CURDIR}/.. @@ -10,7 +10,7 @@ BASE=miniroot MOUNT_POINT= /mnt -VND?= vnd0 +VND?= svnd0 VND_DEV= /dev/${VND}a VND_RDEV= /dev/r${VND}a VND_CRDEV= /dev/r${VND}c @@ -52,9 +52,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} 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} diff --git a/distrib/mac68k/inst-common/Makefile.inc b/distrib/mac68k/inst-common/Makefile.inc index cf65c9084da..7310bda4f5c 100644 --- a/distrib/mac68k/inst-common/Makefile.inc +++ b/distrib/mac68k/inst-common/Makefile.inc @@ -1,4 +1,5 @@ # +# $OpenBSD: Makefile.inc,v 1.3 1997/05/14 18:39:01 niklas Exp $ # $NetBSD: Makefile.inc,v 1.1 1995/07/18 04:13:14 briggs Exp $ # @@ -8,7 +9,7 @@ CBIN= raminst 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 diff --git a/distrib/miniroot/Makefile b/distrib/miniroot/Makefile index 3b4fb51b5a0..6203d75524a 100644 --- a/distrib/miniroot/Makefile +++ b/distrib/miniroot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 1997/05/11 20:01:58 millert Exp $ +# $OpenBSD: Makefile,v 1.14 1997/05/14 18:39:02 niklas Exp $ # $NetBSD: Makefile,v 1.2.4.3 1996/07/04 07:05:32 leo Exp $ # Revision is 2.1 @@ -12,7 +12,7 @@ ARCHDIR= ${.CURDIR}/../${MACHINE}/miniroot .endif MOUNT_POINT?= /mnt -VND?= vnd0 +VND?= svnd0 VND_DEV= /dev/${VND}a VND_RDEV= /dev/r${VND}a DISKTYPE= miniroot @@ -55,7 +55,6 @@ all: ${CBIN} bsd @echo "" umount ${MOUNT_POINT} vnconfig -u ${VND_DEV} - cat /*bin/* > /dev/null cp ${REALIMAGE} ${IMAGE} rm ${REALIMAGE} diff --git a/distrib/mvme68k/ramdisk/Makefile b/distrib/mvme68k/ramdisk/Makefile index 7d5d76e84a5..a6cd7598da3 100644 --- a/distrib/mvme68k/ramdisk/Makefile +++ b/distrib/mvme68k/ramdisk/Makefile @@ -1,3 +1,4 @@ +# $OpenBSDBSD: Makefile,v 1.1 1995/07/18 04:13:06 briggs Exp $ # $NetBSD: Makefile,v 1.1 1995/07/18 04:13:06 briggs Exp $ TOP= ${.CURDIR}/.. @@ -10,7 +11,7 @@ BASE=mr MOUNT_POINT= /mnt #FS= ramdisk.fs -VND?= vnd0 +VND?= svnd0 VND_DEV= /dev/${VND}a VND_RDEV= /dev/r${VND}a VND_CRDEV= /dev/r${VND}c @@ -30,16 +31,10 @@ all: bsd.rd # mount ${VND_DEV} ${MOUNT_POINT} # TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ # TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTFLOPPY} -# sync -# cat /*bin/* > /dev/null -# sync # /usr/mdec/installboot -v /mnt/boot ${DESTDIR}/usr/mdec/biosboot ${VND_CRDEV} # @echo "" # @df -i ${MOUNT_POINT} # @echo "" -# sync -# cat /*bin/* > /dev/null -# sync # umount ${MOUNT_POINT} # vnconfig -u ${VND} # cp ${REALIMAGE} ${FS} @@ -74,9 +69,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} diff --git a/distrib/pc532/floppies/inst-common/Makefile.inc b/distrib/pc532/floppies/inst-common/Makefile.inc index 02e21b11d47..c6a1ef5c89c 100644 --- a/distrib/pc532/floppies/inst-common/Makefile.inc +++ b/distrib/pc532/floppies/inst-common/Makefile.inc @@ -1,3 +1,4 @@ +# $OpenBSD: Makefile.inc,v 1.5 1997/05/14 18:39:04 niklas 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. @@ -6,7 +7,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 diff --git a/distrib/simpleroot/Makefile b/distrib/simpleroot/Makefile index b40c540dca8..35ad0e3d3d1 100644 --- a/distrib/simpleroot/Makefile +++ b/distrib/simpleroot/Makefile @@ -1,3 +1,5 @@ +# $OpenBSD: Makefile,v 1.7 1997/05/14 18:39:05 niklas Exp $ + # Revision is 2.1 REV= 21 @@ -8,7 +10,7 @@ ARCHDIR= ${.CURDIR}/../${MACHINE}/simpleroot .endif MOUNT_POINT?= /mnt -VND?= vnd0 +VND?= svnd0 VND_DEV= /dev/${VND}a VND_RDEV= /dev/r${VND}a DISKTYPE= simpleroot @@ -56,7 +58,6 @@ all: @echo "" umount ${MOUNT_POINT} vnconfig -u ${VND} - cat /*bin/* > /dev/null cp ${REALIMAGE} ${IMAGE} .if (${GZIP} == "gzip") ${GZIP} ${IMAGE} diff --git a/distrib/sparc/floppies/inst-common/Makefile.inc b/distrib/sparc/floppies/inst-common/Makefile.inc index beb6f34a82a..1afa9b2ad50 100644 --- a/distrib/sparc/floppies/inst-common/Makefile.inc +++ b/distrib/sparc/floppies/inst-common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.9 1997/05/11 20:01:58 millert Exp $ +# $OpenBSD: Makefile.inc,v 1.10 1997/05/14 18:39:06 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 PID!= echo $$$$ @@ -34,7 +34,6 @@ all: ${CBIN} df -i ${MOUNT_POINT} umount ${MOUNT_POINT} vnconfig -u ${VND} - cat /bin/* > /dev/null # flush buffer cache (yuck) cp ${REALIMAGE} ${IMAGE} rm ${REALIMAGE} diff --git a/distrib/sparc/floppies/kernel/Makefile b/distrib/sparc/floppies/kernel/Makefile index be41224788d..de108ab8fe4 100644 --- a/distrib/sparc/floppies/kernel/Makefile +++ b/distrib/sparc/floppies/kernel/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.9 1997/05/11 20:01:59 millert Exp $ +# $OpenBSD: Makefile,v 1.10 1997/05/14 18:39:07 niklas Exp $ .include "../Makefile.inc" MOUNT_POINT?= /mnt -VND?= vnd0 +VND?= svnd0 VND_DEV= /dev/${VND}a VND_RDEV= /dev/r${VND}a IMAGE= kc${REV}.fs @@ -32,7 +32,6 @@ all: bsd df -i ${MOUNT_POINT} umount ${MOUNT_POINT} vnconfig -u ${VND} - cat /bin/* > /dev/null # flush buffer cache (yuck) cp ${REALIMAGE} ${IMAGE} rm ${REALIMAGE} diff --git a/distrib/vax/inst-common/Makefile.inc b/distrib/vax/inst-common/Makefile.inc index 53f532209df..70376ca38d9 100644 --- a/distrib/vax/inst-common/Makefile.inc +++ b/distrib/vax/inst-common/Makefile.inc @@ -1,4 +1,4 @@ -# $Id: Makefile.inc,v 1.3 1996/12/22 01:52:52 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.4 1997/05/14 18:39:08 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?= miniroot-${REV}.fs |