Fixup (hopefully!) last glitches

5 files changed, 31 insertions, 19 deletions

diff --git a/distrib/amiga/floppies/inst-common/dot.commonutils b/distrib/amiga/floppies/inst-common/dot.commonutils
index 45e71685695..2e0b25a7fec 100644
--- a/distrib/amiga/floppies/inst-common/dot.commonutils
+++ b/distrib/amiga/floppies/inst-common/dot.commonutils
@@ -27,7 +27,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#	$OpenBSD: dot.commonutils,v 1.5 1996/06/29 05:54:06 tholo Exp $
+#	$OpenBSD: dot.commonutils,v 1.6 1996/10/13 17:33:07 niklas Exp $
 
 # Installation utilites (functions), to get OpenBSD installed on
 # the hard disk.  These are meant to be invoked from the shell prompt,
@@ -41,7 +41,6 @@ fi
 
 # counter for possible shared library confusion
 TAR=/bin/tar
-GUNZIP=/usr/bin/gunzip
 
 Set_tmp_dir()
 {
@@ -119,5 +118,12 @@ Extract()
 		tarverbose=
 		;;
 	esac
-	cat "$1".?? | $GUNZIP | (cd $dest_dir ; $TAR -xp"$tarverbose"f -)
+	export TMPDIR=$dest_dir	# /tmp is RO, tar needs to write a tmp-file
+	if [ -r "$1" ]; then
+		cat "$1" | (cd $dest_dir ; $TAR -zxp"$tarverbose"f -)
+	elif [ -r "$1".tar.gz ]; then
+		cat "$1".tar.gz | (cd $dest_dir ; $TAR -zxp"$tarverbose"f -)
+	else
+		cat "$1"?? | (cd $dest_dir ; $TAR -zxp"$tarverbose"f -)
+	fi
 }
diff --git a/distrib/amiga/floppies/inst-common/instbin.conf b/distrib/amiga/floppies/inst-common/instbin.conf
index 73c9b4769a7..4f137b0ca44 100644
--- a/distrib/amiga/floppies/inst-common/instbin.conf
+++ b/distrib/amiga/floppies/inst-common/instbin.conf
@@ -1,12 +1,12 @@
 #
-# kcbin.conf - unified binary for the kc floppy
-# $OpenBSD: instbin.conf,v 1.5 1996/10/10 06:38:50 niklas Exp $	
+# instbin.conf - unified binary for the inst miniroot
+# $OpenBSD: instbin.conf,v 1.6 1996/10/13 17:33:08 niklas Exp $	
 #
 
 srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
 
 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 gzip 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
@@ -14,11 +14,9 @@ progs umount
 
 ln chown chgrp
 ln fsck_ffs ffs
+ln gzip gunzip
+ln gzip zcat
 ln less more
-ln mount_ados ados
-ln mount_cd9660 cd9660
-ln mount_ffs ffs
-ln mount_nfs nfs
 ln pax tar
 ln reboot halt
 ln sh -sh		# init invokes the shell this way
diff --git a/distrib/amiga/floppies/inst-common/list b/distrib/amiga/floppies/inst-common/list
index 6e2d17da4fd..b59976aa387 100644
--- a/distrib/amiga/floppies/inst-common/list
+++ b/distrib/amiga/floppies/inst-common/list
@@ -1,18 +1,19 @@
-#	$OpenBSD: list,v 1.6 1996/09/22 20:20:43 tholo Exp $
+#	$OpenBSD: list,v 1.7 1996/10/13 17:33:08 niklas Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin	instbin
 LINK	instbin			bin/cat
 LINK	instbin			bin/chmod
 LINK	instbin			bin/cp
-LINK	instbin			bin/df
 LINK	instbin			bin/dd
+LINK	instbin			bin/df
 LINK	instbin			bin/ed
 LINK	instbin			bin/expr
 LINK	instbin			bin/ln
 LINK	instbin			bin/ls
 LINK	instbin			bin/mkdir
 LINK	instbin			bin/mv
+LINK	instbin			bin/pax
 LINK	instbin			bin/pwd
 LINK	instbin			bin/rm
 LINK	instbin			bin/sh
@@ -24,6 +25,7 @@ LINK	instbin			bin/test
 LINK	instbin			bin/[
 LINK	instbin			sbin/disklabel
 LINK	instbin			sbin/fsck
+LINK	instbin			sbin/fsck_ffs
 LINK	instbin			sbin/ifconfig
 LINK	instbin			sbin/halt
 LINK	instbin			sbin/init
@@ -32,24 +34,33 @@ LINK	instbin			sbin/mount
 LINK	instbin			sbin/mount_cd9660
 LINK	instbin			sbin/mount_ados
 LINK	instbin			sbin/mount_ffs
+LINK	instbin			sbin/mount_msdos
 LINK	instbin			sbin/mount_nfs
+LINK	instbin			sbin/mount_kernfs
 LINK	instbin			sbin/newfs
+LINK	instbin			sbin/ping
 LINK	instbin			sbin/reboot
+LINK	instbin			sbin/restore
 LINK	instbin			sbin/route
 LINK	instbin			sbin/shutdown
 LINK	instbin			sbin/slattach
 LINK	instbin			sbin/umount
+LINK	instbin			usr/bin/awk
 LINK	instbin			usr/bin/chgrp
 LINK	instbin			usr/bin/ftp
+LINK	instbin			usr/bin/gunzip
+LINK	instbin			usr/bin/gzip
+LINK	instbin			usr/bin/less
 LINK	instbin			usr/bin/more
 LINK	instbin			usr/bin/printf
+LINK	instbin			usr/bin/rsh
 LINK	instbin			usr/bin/sed
 LINK	instbin			usr/bin/strings
 LINK	instbin			usr/bin/tip
+LINK	instbin			usr/bin/zcat
 LINK	instbin			usr/sbin/chown
 LINK	instbin			usr/sbin/chroot
 LINK	instbin			usr/sbin/pppd
-LINK	instbin			usr/sbin/update
 SPECIAL	/bin/rm instbin
 
 # copy the MAKEDEV script and make some devices
diff --git a/distrib/amiga/floppies/inst/dot.instutils b/distrib/amiga/floppies/inst/dot.instutils
index 9b0568b449a..5c9c1a23f4a 100644
--- a/distrib/amiga/floppies/inst/dot.instutils
+++ b/distrib/amiga/floppies/inst/dot.instutils
@@ -1,4 +1,4 @@
-#	$OpenBSD: dot.instutils,v 1.3 1996/04/25 21:27:28 niklas Exp $
+#	$OpenBSD: dot.instutils,v 1.4 1996/10/13 17:33:06 niklas Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -59,7 +59,7 @@ Configure()
 	fi
 
 	echo	""
-	if [ -e /mnt/etc/sendmail.cf ]; then
+	if [ -e $ETC/sendmail.cf ]; then
 		echo	"WARNING: A default sendmail.cf exists, and probably"
 		echo	"needs to be tuned and/or replaced, to work properly at"
 		echo	"your site!"
diff --git a/distrib/amiga/floppies/inst/dot.profile b/distrib/amiga/floppies/inst/dot.profile
index 73fe5357071..d2d88d201b0 100644
--- a/distrib/amiga/floppies/inst/dot.profile
+++ b/distrib/amiga/floppies/inst/dot.profile
@@ -27,7 +27,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#       $OpenBSD: dot.profile,v 1.2 1996/04/25 02:35:50 mickey Exp $
+#       $OpenBSD: dot.profile,v 1.3 1996/10/13 17:33:07 niklas Exp $
 
 PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
 export PATH
@@ -44,9 +44,6 @@ if [ "X${DONEPROFILE}" = "X" ]; then
 	stty newcrt werase ^W intr ^C kill ^U erase ^? 9600
 	echo ''
 
-	# run update, so that installed software is written as it goes.
-	update
-
 	# pull in the functions that people will use from the shell prompt.
 	. /.commonutils
 	. /.instutils