Assume the fact of a single INST kernel.

Use 1.44M 3" diskette image (no space left on 1.2M 5").

6 files changed, 27 insertions, 23 deletions

diff --git a/distrib/i386/floppies/Makefile b/distrib/i386/floppies/Makefile
index eb05fa89834..208a61b1ea8 100644
--- a/distrib/i386/floppies/Makefile
+++ b/distrib/i386/floppies/Makefile
@@ -1,5 +1,5 @@
-#	$OpenBSD: Makefile,v 1.3 1996/04/25 21:27:57 niklas Exp $
+#	$OpenBSD: Makefile,v 1.4 1996/05/31 22:52:28 mickey Exp $
 
-SUBDIR= inst kcadp kcoth upgr
+SUBDIR= inst kc upgr
 
 .include <bsd.subdir.mk>
diff --git a/distrib/i386/floppies/Makefile.inc b/distrib/i386/floppies/Makefile.inc
index fd667f3c44f..a3129aa03c3 100644
--- a/distrib/i386/floppies/Makefile.inc
+++ b/distrib/i386/floppies/Makefile.inc
@@ -1,5 +1,6 @@
-#	$OpenBSD: Makefile.inc,v 1.4 1996/05/14 14:51:45 mickey Exp $
+#	$OpenBSD: Makefile.inc,v 1.5 1996/05/31 22:52:30 mickey Exp $
 
 # Revision is 1.2
 # all these private copies of the version number really lose.
 REV=	12
+FLOPPY3=1
diff --git a/distrib/i386/floppies/inst-common/Makefile.inc b/distrib/i386/floppies/inst-common/Makefile.inc
index 225403856e7..9d44e01da65 100644
--- a/distrib/i386/floppies/inst-common/Makefile.inc
+++ b/distrib/i386/floppies/inst-common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.2 1996/02/02 07:24:30 dm Exp $
+#	$Id: Makefile.inc,v 1.3 1996/05/31 22:52:31 mickey Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -9,7 +9,7 @@ MOUNT_POINT?=	/mnt
 VND?=		vnd0
 VND_DEV=	/dev/${VND}a
 VND_RDEV=	/dev/r${VND}a
-IMAGE?=		xxx-${REV}.fs
+IMAGE?=		xxx${REV}.fs
 MDEC=		${DESTDIR}/usr/mdec
 
 LISTS=		${COMMONDIR}/list ${.CURDIR}/list
diff --git a/distrib/i386/floppies/kc-common/Makefile.inc b/distrib/i386/floppies/kc-common/Makefile
index 43ed94e8a62..867d29736d7 100644
--- a/distrib/i386/floppies/kc-common/Makefile.inc
+++ b/distrib/i386/floppies/kc-common/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile.inc,v 1.3 1996/04/25 21:28:15 niklas Exp $
+#	$Id: Makefile,v 1.1 1996/05/31 22:52:33 mickey Exp $
 
-# TOP is assumed to be defined by Makefile including this one.
+TOP=		${.CURDIR}/..
 
+.include "${TOP}/Makefile.inc"
+IMAGE=		kc${REV}.fs
 CBIN=		kcbin
-COMMONDIR=	${TOP}/kc-common
-
 MOUNT_POINT?=	/mnt
 VND?=		vnd0
 VND_DEV=	/dev/${VND}a
@@ -12,9 +12,9 @@ VND_RDEV=	/dev/r${VND}a
 IMAGE?=		xxx-${REV}.fs
 MDEC=		${DESTDIR}/usr/mdec
 
-LISTS=		${COMMONDIR}/list ${.CURDIR}/list
-CRUNCHCONF=	${COMMONDIR}/${CBIN}.conf
-MTREE=		${COMMONDIR}/mtree.conf
+LIST=		${.CURDIR}/list
+CRUNCHCONF=	${.CURDIR}/${CBIN}.conf
+MTREE=		${.CURDIR}/mtree.conf
 
 all: ${CBIN}
 .ifndef FLOPPY3
@@ -23,18 +23,18 @@ all: ${CBIN}
 .ifndef FLOPPY3
 	dd if=/dev/zero of=${IMAGE} bs=10k count=120
 	vnconfig -v -c ${VND_DEV} ${IMAGE}
-	disklabel -w -B -b ${MDEC}/fdboot -s ${MDEC}/bootfd ${VND} floppy5
-	newfs -O -m 0 -o space -i 5120 -c 80 ${VND_RDEV} floppy5
+	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
 .else
 	dd if=/dev/zero of=${IMAGE} bs=10k count=144
 	vnconfig -v -c ${VND_DEV} ${IMAGE}
-	disklabel -w -B -b ${MDEC}/fdboot -s ${MDEC}/bootfd ${VND} floppy3
-	newfs -O -m 0 -o space -i 5120 -c 80 ${VND_RDEV} floppy3
+	disklabel -w -B -b /usr/mdec/fdboot -s /usr/mdec/bootfd ${VND} floppy3
+	newfs -O -m 0 -o space -i 8192 -c 80 ${VND_RDEV} floppy3
 .endif
 	mount ${VND_DEV} ${MOUNT_POINT}
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
+	    TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LIST}
 	@echo ""
 	@df -i ${MOUNT_POINT}
 	@echo ""
diff --git a/distrib/i386/floppies/kc-common/kcbin.conf b/distrib/i386/floppies/kc-common/kcbin.conf
index 04604dafa9b..ab73338628e 100644
--- a/distrib/i386/floppies/kc-common/kcbin.conf
+++ b/distrib/i386/floppies/kc-common/kcbin.conf
@@ -1,11 +1,11 @@
-#	$OpenBSD: kcbin.conf,v 1.2 1996/04/25 21:28:18 niklas Exp $	
+#	$OpenBSD: kcbin.conf,v 1.3 1996/05/31 22:52:36 mickey Exp $	
 #
 # kcbin.conf - unified binary for the kc floppy
 #
 
 srcdirs bin sbin
 
-progs cp dd disklabel fsck init mount mount_ffs reboot sh test umount
+progs cp dd disklabel fsck_ffs init mount mount_ffs reboot sh test umount
 
 ln test [
 ln mount_ffs ffs
diff --git a/distrib/i386/floppies/kc-common/list b/distrib/i386/floppies/kc-common/list
index 15943b8c336..ac90e678040 100644
--- a/distrib/i386/floppies/kc-common/list
+++ b/distrib/i386/floppies/kc-common/list
@@ -1,4 +1,7 @@
-#	$OpenBSD: list,v 1.2 1996/04/25 21:28:20 niklas Exp $
+#	$OpenBSD: list,v 1.3 1996/05/31 22:52:37 mickey Exp $
+
+# copy the kernel
+COPY	${CURDIR}/../../../../sys/arch/i386/compile/INST/bsd	bsd
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/kcbin	kcbin
@@ -8,7 +11,7 @@ LINK	kcbin		bin/sh
 LINK	kcbin		bin/test
 LINK	kcbin		bin/[
 LINK	kcbin		sbin/disklabel
-LINK	kcbin		sbin/fsck
+LINK	kcbin		sbin/fsck_ffs
 LINK	kcbin		sbin/halt
 LINK	kcbin		sbin/init
 LINK	kcbin		sbin/mount
@@ -26,6 +29,6 @@ SPECIAL	/bin/rm dev/MAKEDEV
 COPYDIR	${DESTDIR}/usr/mdec	usr/mdec
 
 # copy the common kc-floppy tools
-COPY	${TOPDIR}/kc-common/dot.profile		.profile
-COPY	${TOPDIR}/kc-common/copy_kernel.sh	copy_kernel
+COPY	${CURDIR}/dot.profile		.profile
+COPY	${CURDIR}/copy_kernel.sh	copy_kernel
 SPECIAL	chmod 755 copy_kernel