From: deraadt <deraadt@openbsd.org>
Date: Sat, 14 Sep 1996 03:42:56 +0000 (+0000)
Subject: install target; disklabel on image instead, more inodes
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=ae030d13d77c0c30e7b2a1c29b7115b88e5f22c1;p=openbsd

install target; disklabel on image instead, more inodes
---

diff --git a/distrib/i386/floppies/Makefile b/distrib/i386/floppies/Makefile
index eb8a13a2d3e..3f44c69e455 100644
--- a/distrib/i386/floppies/Makefile
+++ b/distrib/i386/floppies/Makefile
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile,v 1.5 1996/06/21 23:13:15 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 1996/09/14 03:42:56 deraadt Exp $
 
-SUBDIR= inst kc upgr
+SUBDIR= kc inst upgr
 
 unconfig:
 	cd kc; ${MAKE} unconfig
diff --git a/distrib/i386/floppies/inst-common/Makefile.inc b/distrib/i386/floppies/inst-common/Makefile.inc
index 57b42f419ab..0956f7a83a8 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.6 1996/06/16 11:02:25 deraadt Exp $
+#	$Id: Makefile.inc,v 1.7 1996/09/14 03:42:59 deraadt Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -52,6 +52,9 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
 ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 	make -f ${CBIN}.mk all
 
+install:
+	cp ${IMAGE} ${DESTDIR}/snapshot/
+
 clean cleandir:
 	/bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk \
 		${CBIN}.cache *.o *.lo *.c
diff --git a/distrib/i386/floppies/kc/Makefile b/distrib/i386/floppies/kc/Makefile
index d42f552a804..868423423a2 100644
--- a/distrib/i386/floppies/kc/Makefile
+++ b/distrib/i386/floppies/kc/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1996/07/01 18:09:16 deraadt Exp $
+#	$Id: Makefile,v 1.8 1996/09/14 03:43:02 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -24,20 +24,20 @@ bsd:
 	    make clean && make depend && make
 	cp ${.CURDIR}/../../../../sys/arch/i386/compile/INST/bsd bsd
 
-all: ${CBIN} bsd
+all: bsd ${CBIN}
 .ifndef FLOPPY3
 .else
 .endif
 .ifndef FLOPPY3
 	dd if=/dev/zero of=${REALIMAGE} bs=10k count=120
+	disklabel -w -B -b /usr/mdec/fdboot -s /usr/mdec/bootfd ${REALIMAGE} floppy5
 	vnconfig -v -c ${VND_DEV} ${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
 .else
 	dd if=/dev/zero of=${REALIMAGE} bs=10k count=144
+	disklabel -w -B -b /usr/mdec/fdboot -s /usr/mdec/bootfd ${REALIMAGE} floppy3
 	vnconfig -v -c ${VND_DEV} ${REALIMAGE}
-	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
+	newfs -O -m 0 -o space -i 6500 -c 80 ${VND_RDEV} floppy3
 .endif
 	mount ${VND_DEV} ${MOUNT_POINT}
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
@@ -66,5 +66,8 @@ ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
 clean cleandir:
 	/bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.lo *.c
 
+install:
+	cp ${IMAGE} ${DESTDIR}/snapshot
+
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>