Update for removal of GNU tar(1)

3 files changed, 10 insertions, 9 deletions

diff --git a/distrib/pc532/floppies/inst-common/dot.commonutils b/distrib/pc532/floppies/inst-common/dot.commonutils
index c177aa9318e..95261cc05d2 100644
--- a/distrib/pc532/floppies/inst-common/dot.commonutils
+++ b/distrib/pc532/floppies/inst-common/dot.commonutils
@@ -1,4 +1,4 @@
-#	$OpenBSD: dot.commonutils,v 1.4 1996/04/25 21:30:35 niklas Exp $
+#	$OpenBSD: dot.commonutils,v 1.5 1996/06/29 05:54:20 tholo Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -39,7 +39,7 @@ if [ ! -f /etc/fstab ]; then
 fi
 
 # counter for possible shared library confusion
-TAR=/usr/bin/tar
+TAR=/bin/tar
 GUNZIP=/usr/bin/gunzip
 
 Set_tmp_dir()
@@ -110,7 +110,7 @@ Load_tape()
 	echo -n "continue..."
 	read foo
 	echo	"Extracting files from the tape..."
-	$TAR --unlink -xvpf /dev/$which
+	$TAR -xvpf /dev/$which
 	echo	"Done."
 }
 
@@ -127,7 +127,7 @@ Extract()
 		tarverbose=
 		;;
 	esac
-	cat "$1"* | $GUNZIP | (cd $dest_dir ; $TAR  --unlink -xp"$tarverbose"f - )
+	cat "$1"* | $GUNZIP | (cd $dest_dir ; $TAR -xp"$tarverbose"f - )
 }
 
 xd()
diff --git a/distrib/pc532/floppies/inst-common/instbin.conf b/distrib/pc532/floppies/inst-common/instbin.conf
index 3795cfcfa9c..b84feb96d3e 100644
--- a/distrib/pc532/floppies/inst-common/instbin.conf
+++ b/distrib/pc532/floppies/inst-common/instbin.conf
@@ -1,6 +1,6 @@
 #
 # kcbin.conf - unified binary for the kc floppy
-# $Id: instbin.conf,v 1.3 1995/12/14 07:00:36 deraadt Exp $	
+# $Id: instbin.conf,v 1.4 1996/06/29 05:54:21 tholo Exp $	
 #
 
 srcdirs bin sbin usr.bin usr.sbin gnu/usr.bin games
@@ -11,9 +11,9 @@ progs expr factor find fsck ftp
 progs gawk gzip hostname hexdump ifconfig init 
 progs kill kvm_mkdb ln ls mkdir mknod more
 progs mount mount_cd9660 mount_ffs mount_msdos mount_nfs mt mv netstat newfs
-progs ping pppd pppstats ps pwd rcp reboot restore rm rmdir route
+progs pax ping pppd pppstats ps pwd rcp reboot restore rm rmdir route
 progs sed sh slattach strings stty swapon sync sysctl 
-progs tar test tip traceroute umount update vi
+progs test tip traceroute umount update vi
 
 special chat srcdir /usr/src/usr.sbin/pppd/chat
 special pppstats srcdir /usr/src/usr.sbin/pppd/pppstats
@@ -30,6 +30,7 @@ ln mount_cd9660 cd9660
 ln mount_ffs ffs
 ln mount_msdos msdos
 ln mount_nfs nfs
+ln pax tar
 ln restore rrestore
 ln vi ex
 ln vi view
diff --git a/distrib/pc532/floppies/inst-common/list b/distrib/pc532/floppies/inst-common/list
index ae2ef0179b6..ad54d5b3c3b 100644
--- a/distrib/pc532/floppies/inst-common/list
+++ b/distrib/pc532/floppies/inst-common/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.4 1996/04/25 21:30:44 niklas Exp $
+#	$OpenBSD: list,v 1.5 1996/06/29 05:54:21 tholo Exp $
 
 # copy the MAKEDEV script and make some devices
 COPY	${DESTDIR}/dev/MAKEDEV	dev/MAKEDEV
@@ -44,6 +44,7 @@ LINK	instbin			bin/rmdir
 LINK	instbin			bin/sh
 LINK	instbin			bin/stty
 LINK	instbin			bin/sync
+LINK	instbin			bin/tar
 LINK	instbin			bin/test
 LINK	instbin			bin/[
 LINK	instbin			sbin/bim
@@ -85,7 +86,6 @@ SYMLINK	/instbin		usr/bin/more
 SYMLINK	/instbin		usr/bin/netstat
 SYMLINK	/instbin		usr/bin/sed
 SYMLINK	/instbin		usr/bin/strings
-SYMLINK	/instbin		usr/bin/tar
 SYMLINK	/instbin		usr/bin/tip
 SYMLINK /instbin		usr/bin/vi
 SYMLINK /instbin		usr/bin/view