Sync with reality

7 files changed, 25 insertions, 17 deletions

diff --git a/distrib/amiga/Makefile b/distrib/amiga/Makefile
new file mode 100644
index 00000000000..e06e9c06035
--- /dev/null
+++ b/distrib/amiga/Makefile
@@ -0,0 +1,5 @@
+#	$OpenBSD: Makefile,v 1.1 1996/10/10 06:38:46 niklas Exp $
+
+SUBDIR=	../crunch floppies
+
+.include <bsd.subdir.mk>
diff --git a/distrib/amiga/floppies/Makefile b/distrib/amiga/floppies/Makefile
index ecbc7cc99e3..52345bc635f 100644
--- a/distrib/amiga/floppies/Makefile
+++ b/distrib/amiga/floppies/Makefile
@@ -1,4 +1,4 @@
-#	$Id
+#	$OpenBSD: Makefile,v 1.2 1996/10/10 06:38:48 niklas Exp $
 
 SUBDIR= inst upgr
 
diff --git a/distrib/amiga/floppies/Makefile.inc b/distrib/amiga/floppies/Makefile.inc
index 9bc50fdab05..39c99c9949a 100644
--- a/distrib/amiga/floppies/Makefile.inc
+++ b/distrib/amiga/floppies/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.2 1996/04/25 02:35:46 mickey Exp $
+#	$OpenBSD: Makefile.inc,v 1.3 1996/10/10 06:38:48 niklas Exp $
 
-# Revision is 1.2
-REV=	12
+# Revision is 2.0
+REV=	20
diff --git a/distrib/amiga/floppies/inst-common/Makefile.inc b/distrib/amiga/floppies/inst-common/Makefile.inc
index 69f9ddbbfa0..a9a11c3269e 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.4 1996/04/25 02:35:54 mickey Exp $
+#	$OpenBSD: Makefile.inc,v 1.5 1996/10/10 06:38:50 niklas Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
diff --git a/distrib/amiga/floppies/inst-common/instbin.conf b/distrib/amiga/floppies/inst-common/instbin.conf
index 97c50cda510..73c9b4769a7 100644
--- a/distrib/amiga/floppies/inst-common/instbin.conf
+++ b/distrib/amiga/floppies/inst-common/instbin.conf
@@ -1,17 +1,20 @@
 #
 # kcbin.conf - unified binary for the kc floppy
-# $OpenBSD: instbin.conf,v 1.4 1996/09/22 20:20:43 tholo Exp $	
+# $OpenBSD: instbin.conf,v 1.5 1996/10/10 06:38:50 niklas Exp $	
 #
 
-srcdirs bin sbin usr.bin usr.sbin gnu/usr.bin
+srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
 
-progs cat chmod chown chroot cp dd df disklabel ed expr fsck ftp 
-progs ifconfig init ln ls mkdir mknod more mount mount_cd9660
-progs mount_ados mount_ffs mount_nfs mv newfs pax printf pppd pwd reboot rm
-progs route sed sh shutdown slattach strings stty sync test tip
-progs umount update
+progs awk cat chmod chown chroot cp dd df disklabel ed expr fsck_ffs ftp 
+progs ifconfig init less ln ls mkdir mknod mount mount_cd9660
+progs mount_ados mount_ffs mount_msdos mount_nfs mount_kernfs mv newfs
+progs pax ping printf pppd pwd reboot restore rm
+progs route rsh sed sh shutdown slattach strings stty sync test tip
+progs umount
 
 ln chown chgrp
+ln fsck_ffs ffs
+ln less more
 ln mount_ados ados
 ln mount_cd9660 cd9660
 ln mount_ffs ffs
@@ -21,4 +24,4 @@ ln reboot halt
 ln sh -sh		# init invokes the shell this way
 ln test [
 
-libs -ledit -lutil -ltermcap -lcrypt -ll -lz -lm
+libs -ledit -lutil -ltermcap -lkrb -ldes -ll -lz -lm
diff --git a/distrib/amiga/floppies/inst/install.sh b/distrib/amiga/floppies/inst/install.sh
index 01cf3bb48c6..3c9a214ffa7 100644
--- a/distrib/amiga/floppies/inst/install.sh
+++ b/distrib/amiga/floppies/inst/install.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: install.sh,v 1.3 1996/04/25 21:27:30 niklas Exp $
+#	$OpenBSD: install.sh,v 1.4 1996/10/10 06:38:49 niklas Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -36,7 +36,7 @@
 FSTABDIR=/mnt/etc			# /mnt/etc
 #DONTDOIT==echo
 
-VERSION=1.1
+VERSION=2.0
 FSTAB=${FSTABDIR}/fstab
 
 getresp() {
diff --git a/distrib/amiga/floppies/inst/list b/distrib/amiga/floppies/inst/list
index 42c05c2067e..d58cd3ca66b 100644
--- a/distrib/amiga/floppies/inst/list
+++ b/distrib/amiga/floppies/inst/list
@@ -1,10 +1,10 @@
-#	$OpenBSD: list,v 1.5 1996/04/25 21:27:32 niklas Exp $
+#	$OpenBSD: list,v 1.6 1996/10/10 06:38:49 niklas Exp $
 
 # the disktab explanation file
 COPY	disktab.preinstall		etc
 
 # copy the kernel
-COPY	${CURDIR}/../../../../sys/arch/amiga/compile/INSTALL/bsd	bsd
+COPY	${CURDIR}/../../../../sys/arch/amiga/compile/GENERIC/bsd	bsd
 
 # and the installation tools
 COPY	dot.profile			.profile