From: deraadt <deraadt@openbsd.org>
Date: Mon, 31 Mar 1997 07:36:05 +0000 (+0000)
Subject: works again, work by niklas and i
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=6c633ae83e462a995ee2ce6280feb36f5b6579cc;p=openbsd

works again, work by niklas and i
---

diff --git a/distrib/sparc/floppies/inst-common/Makefile.inc b/distrib/sparc/floppies/inst-common/Makefile.inc
index 838660f79e4..db250a9e23e 100644
--- a/distrib/sparc/floppies/inst-common/Makefile.inc
+++ b/distrib/sparc/floppies/inst-common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.4 1997/02/09 16:50:37 deraadt Exp $
+#	$Id: Makefile.inc,v 1.5 1997/03/31 07:36:05 deraadt Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -26,7 +26,7 @@ all: ${CBIN}
 	dd if=/dev/zero of=${REALIMAGE} bs=120k count=12
 	vnconfig -v -c ${VND} ${REALIMAGE}
 	disklabel -w ${VND} floppy3
-	newfs -O -m 0 -o space -i 20480 -c 80 ${VND_RDEV} floppy
+	newfs -O -m 0 -o space -i 8192 -c 80 ${VND_RDEV} floppy
 	mount ${VND_DEV} ${MOUNT_POINT}
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
diff --git a/distrib/sparc/floppies/inst-common/instbin-krb.conf b/distrib/sparc/floppies/inst-common/instbin-krb.conf
index f4f654dd5b6..bdfed1c7c2a 100644
--- a/distrib/sparc/floppies/inst-common/instbin-krb.conf
+++ b/distrib/sparc/floppies/inst-common/instbin-krb.conf
@@ -1,6 +1,6 @@
 #
 # kcbin.conf - unified binary for the kc floppy
-# $Id: instbin-krb.conf,v 1.1 1997/02/09 16:50:51 deraadt Exp $	
+# $Id: instbin-krb.conf,v 1.2 1997/03/31 07:36:07 deraadt Exp $	
 #
 
 srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
@@ -10,7 +10,7 @@ progs ftp
 progs ifconfig init less ln ls mkdir mknod mount mount_cd9660
 progs mount_ffs mount_nfs mount_kernfs
 progs mv newfs pax pdksh ping pwd reboot rm route
-progs sed strings stty sync test umount
+progs sed stty sync test umount
 progs gzip
 
 ln chown chgrp
diff --git a/distrib/sparc/floppies/inst-common/instbin.conf b/distrib/sparc/floppies/inst-common/instbin.conf
index 2ad6023abd2..23935de8465 100644
--- a/distrib/sparc/floppies/inst-common/instbin.conf
+++ b/distrib/sparc/floppies/inst-common/instbin.conf
@@ -1,6 +1,6 @@
 #
 # kcbin.conf - unified binary for the kc floppy
-# $Id: instbin.conf,v 1.9 1997/02/09 16:50:52 deraadt Exp $	
+# $Id: instbin.conf,v 1.10 1997/03/31 07:36:08 deraadt Exp $	
 #
 
 srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
@@ -10,7 +10,7 @@ progs ftp
 progs ifconfig init less ln ls mkdir mknod mount mount_cd9660
 progs mount_ffs mount_nfs mount_kernfs
 progs mv newfs pax pdksh ping pwd reboot rm route
-progs sed strings stty sync test umount
+progs sed stty sync test umount
 progs rsh gzip
 
 ln chown chgrp
diff --git a/distrib/sparc/floppies/inst-common/list b/distrib/sparc/floppies/inst-common/list
index 3344f7f919d..d2f402125f9 100644
--- a/distrib/sparc/floppies/inst-common/list
+++ b/distrib/sparc/floppies/inst-common/list
@@ -1,4 +1,4 @@
-#	$Id: list,v 1.7 1997/02/09 16:50:53 deraadt Exp $
+#	$Id: list,v 1.8 1997/03/31 07:36:09 deraadt Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin	instbin
@@ -47,7 +47,6 @@ SYMLINK	/bin/cat		usr/bin/less
 SYMLINK	/bin/cat		usr/bin/gzip
 SYMLINK	/bin/cat		usr/bin/more
 SYMLINK	/bin/cat		usr/bin/sed
-SYMLINK	/bin/cat		usr/bin/strings
 #SYMLINK /bin/cat		usr/bin/tip
 #SYMLINK /bin/cat		usr/sbin/bad144
 SYMLINK	/bin/cat		usr/sbin/chown
@@ -57,8 +56,7 @@ SPECIAL sync
 
 # copy the MAKEDEV script and make some devices
 COPY	${DESTDIR}/dev/MAKEDEV	dev/MAKEDEV
-SPECIAL	cd dev; sh ${DESTDIR}/dev/MAKEDEV std fd0
-#SPECIAL	/bin/rm dev/MAKEDEV
+SPECIAL	cd dev; sh ${DESTDIR}/dev/MAKEDEV floppy
 
 # we need the contents of /usr/mdec
 #COPY	/usr/mdec/boot	usr/mdec/boot