Update for removal of GNU tar(1)

39 files changed, 109 insertions, 109 deletions

diff --git a/distrib/amiga/floppies/inst-common/dot.commonutils b/distrib/amiga/floppies/inst-common/dot.commonutils
index aaa88b6e7a3..45e71685695 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.4 1996/04/25 02:35:56 mickey Exp $
+#	$OpenBSD: dot.commonutils,v 1.5 1996/06/29 05:54:06 tholo Exp $
 
 # Installation utilites (functions), to get OpenBSD installed on
 # the hard disk.  These are meant to be invoked from the shell prompt,
@@ -40,7 +40,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()
@@ -102,7 +102,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."
 }
 
@@ -119,5 +119,5 @@ Extract()
 		tarverbose=
 		;;
 	esac
-	cat "$1".?? | $GUNZIP | (cd $dest_dir ; $TAR --unlink -xp"$tarverbose"f -)
+	cat "$1".?? | $GUNZIP | (cd $dest_dir ; $TAR -xp"$tarverbose"f -)
 }
diff --git a/distrib/amiga/floppies/inst-common/instbin.conf b/distrib/amiga/floppies/inst-common/instbin.conf
index 8eb9c4f9a70..8ae488e4de6 100644
--- a/distrib/amiga/floppies/inst-common/instbin.conf
+++ b/distrib/amiga/floppies/inst-common/instbin.conf
@@ -1,14 +1,14 @@
 #
 # kcbin.conf - unified binary for the kc floppy
-# $OpenBSD: instbin.conf,v 1.2 1996/04/25 02:35:57 mickey Exp $	
+# $OpenBSD: instbin.conf,v 1.3 1996/06/29 05:54:06 tholo Exp $	
 #
 
 srcdirs bin sbin usr.bin usr.sbin gnu/usr.bin
 
 progs cat chmod chown chroot cp dd df disklabel ed expr fsck ftp 
 progs gzip ifconfig init ln ls mkdir mknod more mount mount_cd9660
-progs mount_ados mount_ffs mount_nfs mv newfs printf pppd pwd reboot rm
-progs route sed sh shutdown slattach strings stty sync tar test tip
+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
 
 ln chown chgrp
@@ -17,6 +17,7 @@ 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
 ln test [
diff --git a/distrib/amiga/floppies/inst-common/list b/distrib/amiga/floppies/inst-common/list
index 570860e439c..685be8ca480 100644
--- a/distrib/amiga/floppies/inst-common/list
+++ b/distrib/amiga/floppies/inst-common/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.4 1996/04/25 02:35:59 mickey Exp $
+#	$OpenBSD: list,v 1.5 1996/06/29 05:54:06 tholo Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin	instbin
@@ -19,6 +19,7 @@ LINK	instbin			bin/sh
 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/disklabel
@@ -47,7 +48,6 @@ LINK	instbin			usr/bin/more
 LINK	instbin			usr/bin/printf
 LINK	instbin			usr/bin/sed
 LINK	instbin			usr/bin/strings
-LINK	instbin			usr/bin/tar
 LINK	instbin			usr/bin/tip
 LINK	instbin			usr/sbin/chown
 LINK	instbin			usr/sbin/chroot
diff --git a/distrib/amiga/floppies/upgr/upgrade.sh b/distrib/amiga/floppies/upgr/upgrade.sh
index d4c1517ca68..cd8f62cd2c4 100644
--- a/distrib/amiga/floppies/upgr/upgrade.sh
+++ b/distrib/amiga/floppies/upgr/upgrade.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: upgrade.sh,v 1.3 1996/04/25 21:27:41 niklas Exp $
+#	$OpenBSD: upgrade.sh,v 1.4 1996/06/29 05:54:07 tholo Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -261,7 +261,7 @@ fi
 
 echo	""
 echo	"Copying bootstrapping binaries and config files to the hard drive..."
-$DONTDOIT tar -cf - sbin/mount_ffs | (cd /mnt ; tar --unlink -xpf - )
+$DONTDOIT tar -cf - sbin/mount_ffs | (cd /mnt ; tar -xpf - )
 
 echo	""
 echo	"Mounting remaining partitions..."
diff --git a/distrib/atari/inst-common/dot.commonutils b/distrib/atari/inst-common/dot.commonutils
index 41634c9d297..9d2e02ec8db 100644
--- a/distrib/atari/inst-common/dot.commonutils
+++ b/distrib/atari/inst-common/dot.commonutils
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: dot.commonutils,v 1.4 1996/03/28 21:48:12 niklas Exp $
+#	$OpenBSD: dot.commonutils,v 1.5 1996/06/29 05:54:08 tholo Exp $
 #	$NetBSD: dot.commonutils,v 1.4 1996/02/28 10:06:40 leo Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
@@ -130,9 +130,9 @@ Extract()
 	if [ $snapshot = n ]
 	then
 		cat "$1".?? | gunzip |
-			(cd $dest_dir ; tar --unlink -xp"$tarverbose"f -)
+			(cd $dest_dir ; tar -xp"$tarverbose"f -)
 	else
 		cat "$1".tar.gz | gunzip |
-			(cd $dest_dir ; tar --unlink -xp"$tarverbose"f -)
+			(cd $dest_dir ; tar -xp"$tarverbose"f -)
 	fi
 }
diff --git a/distrib/atari/inst-common/instbin.conf b/distrib/atari/inst-common/instbin.conf
index 17c4aaa4ff2..7e95f5ff14b 100644
--- a/distrib/atari/inst-common/instbin.conf
+++ b/distrib/atari/inst-common/instbin.conf
@@ -9,13 +9,14 @@ srcdirs /usr/src/gnu/usr.bin
 
 progs cat chmod chown chroot cp dd df disklabel ed expr fsck ftp 
 progs gzip ifconfig init ln ls mkdir mknod more mount mount_cd9660
-progs mount_ffs mount_msdos mount_nfs mv newfs printf pwd reboot rm route sed
-progs sh shutdown slattach strings stty sync tar test tip umount update
+progs mount_ffs mount_msdos mount_nfs mv newfs pax printf pwd reboot rm route sed
+progs sh shutdown slattach strings stty sync test tip umount update
 
 ln chown chgrp
 ln gzip gzcat gunzip
 ln reboot halt
 ln sh -sh		# init invokes the shell this way
+ln pax tar
 ln test [
 ln mount_ffs ffs
 ln mount_msdos msdos
diff --git a/distrib/atari/inst-common/list b/distrib/atari/inst-common/list
index eacdf29338b..e95d1b62f54 100644
--- a/distrib/atari/inst-common/list
+++ b/distrib/atari/inst-common/list
@@ -21,6 +21,7 @@ LINK	instbin			bin/sh
 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/disklabel
@@ -49,7 +50,6 @@ LINK	instbin			usr/bin/more
 LINK	instbin			usr/bin/printf
 LINK	instbin			usr/bin/sed
 LINK	instbin			usr/bin/strings
-LINK	instbin			usr/bin/tar
 LINK	instbin			usr/bin/tip
 LINK	instbin			usr/sbin/chown
 LINK	instbin			usr/sbin/chroot
diff --git a/distrib/hp300/miniroot/inst-common/instbin.conf b/distrib/hp300/miniroot/inst-common/instbin.conf
index aca4ed1f3ef..a956648388e 100644
--- a/distrib/hp300/miniroot/inst-common/instbin.conf
+++ b/distrib/hp300/miniroot/inst-common/instbin.conf
@@ -7,8 +7,8 @@ srcdirs bin sbin usr.bin usr.sbin gnu/usr.bin usr.bin/vi
 progs basename cat cut chflags chmod chown chroot cp dd df disklabel
 progs dmesg ed expr fsck ftp gawk grep gzip hostname ifconfig init kill ln ls
 progs mkdir mknod more mount mount_cd9660 mount_ffs mount_nfs mt mv newfs
-progs netstat ping pwd reboot rm route rsh sed sh shutdown slattach sleep
-progs sort strings stty sync tar test tip tset umount update
+progs netstat pax ping pwd reboot rm route rsh sed sh shutdown slattach sleep
+progs sort strings stty sync test tip tset umount update
 
 # XXX catch vi; see above
 progs common
@@ -16,6 +16,7 @@ progs common
 ln chown chgrp
 ln gawk awk
 ln gzip gzcat gunzip
+ln pax tar
 ln sh -sh		# init invokes the shell this way
 ln test [
 ln mount_cd9660 cd9660
diff --git a/distrib/hp300/miniroot/inst-common/list b/distrib/hp300/miniroot/inst-common/list
index 1dbd0911428..dc062bc4ce8 100644
--- a/distrib/hp300/miniroot/inst-common/list
+++ b/distrib/hp300/miniroot/inst-common/list
@@ -22,6 +22,7 @@ LINK	instbin			bin/sh
 LINK	instbin			bin/stty
 LINK	instbin			bin/sleep
 LINK	instbin			bin/sync
+LINK	instbin			bin/tar
 LINK	instbin			bin/test
 LINK	instbin			bin/[
 LINK	instbin			sbin/disklabel
@@ -58,7 +59,6 @@ SYMLINK	/instbin		usr/bin/rsh
 SYMLINK	/instbin		usr/bin/sed
 SYMLINK	/instbin		usr/bin/strings
 SYMLINK	/instbin		usr/bin/sort
-SYMLINK	/instbin		usr/bin/tar
 SYMLINK	/instbin		usr/bin/tip
 SYMLINK	/instbin		usr/bin/tset
 SYMLINK	/instbin		usr/bin/vi
diff --git a/distrib/hp300/miniroot/inst/install.sh b/distrib/hp300/miniroot/inst/install.sh
index faa9d0cf61a..27d87d0d65e 100644
--- a/distrib/hp300/miniroot/inst/install.sh
+++ b/distrib/hp300/miniroot/inst/install.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: install.sh,v 1.5 1996/03/28 21:48:14 niklas Exp $
+#	$OpenBSD: install.sh,v 1.6 1996/06/29 05:54:09 tholo Exp $
 #	$NetBSD: install.sh,v 1.7 1996/02/28 00:44:01 thorpej Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -688,7 +688,7 @@ __install_ftp_2
 		fi
 
 		_ftp_file=`echo ${resp} | awk '{print $1}'`
-		echo "get ${_ftp_file} |\"tar --unlink -zxvpf -\"" >> \
+		echo "get ${_ftp_file} |\"tar -xzvpf -\"" >> \
 		    /tmp/ftp-script.sh
 	done
 
@@ -719,7 +719,7 @@ install_common_nfs_cdrom() {
 	fi
 
 	# Extract file
-	cat $_common_filename | (cd /mnt; tar --unlink -zxvpf -)
+	cat $_common_filename | (cd /mnt; tar -xzvpf -)
 	echo "Extraction complete."
 }
 
@@ -939,14 +939,14 @@ __install_tape_2
 			1)
 				(
 					cd /mnt
-					dd if=$TAPE | tar --unlink -zxvpf -
+					dd if=$TAPE | tar -xzvpf -
 				)
 				;;
 
 			2)
 				(
 					cd /mnt
-					dd if=$TAPE | tar --unlink -xvpf -
+					dd if=$TAPE | tar -xzvpf -
 				)
 				;;
 
@@ -1365,7 +1365,7 @@ if [ -f /base.tar.gz ]; then
 				getresp "y"
 				case "$resp" in
 				y*|Y*)
-				     cat $_f | (cd /mnt; tar --unlink -zxvpf -)
+				     cat $_f | (cd /mnt; tar -xzvpf -)
 					_yup="TRUE"
 					;;
 				*)
diff --git a/distrib/hp300/miniroot/inst/upgrade.sh b/distrib/hp300/miniroot/inst/upgrade.sh
index 252afd6a8d6..a4b869b1e05 100644
--- a/distrib/hp300/miniroot/inst/upgrade.sh
+++ b/distrib/hp300/miniroot/inst/upgrade.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: upgrade.sh,v 1.3 1996/03/28 21:48:16 niklas Exp $
+#	$OpenBSD: upgrade.sh,v 1.4 1996/06/29 05:54:10 tholo Exp $
 #	$NetBSD: upgrade.sh,v 1.3 1996/02/28 00:44:06 thorpej Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -275,7 +275,7 @@ __install_ftp_2
 		fi
 
 		_ftp_file=`echo ${resp} | awk '{print $1}'`
-		echo "get ${_ftp_file} |\"tar --unlink -zxvpf -\"" >> \
+		echo "get ${_ftp_file} |\"tar -xzvpf -\"" >> \
 		    /tmp/ftp-script.sh
 	done
 
@@ -306,7 +306,7 @@ install_common_nfs_cdrom() {
 	fi
 
 	# Extract file
-	cat $_common_filename | (cd /mnt; tar --unlink -zxvpf -)
+	cat $_common_filename | (cd /mnt; tar -xzvpf -)
 	echo "Extraction complete."
 }
 
@@ -526,14 +526,14 @@ __install_tape_2
 			1)
 				(
 					cd /mnt
-					dd if=$TAPE | tar --unlink -zxvpf -
+					dd if=$TAPE | tar -xzvpf -
 				)
 				;;
 
 			2)
 				(
 					cd /mnt
-					dd if=$TAPE | tar --unlink -xvpf -
+					dd if=$TAPE | tar -xzvpf -
 				)
 				;;
 
@@ -908,7 +908,7 @@ if [ -f /base.tar.gz ]; then
 				getresp "y"
 				case "$resp" in
 				y*|Y*)
-				     cat $_f | (cd /mnt; tar --unlink -zxvpf -)
+				     cat $_f | (cd /mnt; tar -xzvpf -)
 					_yup="TRUE"
 					;;
 				*)
diff --git a/distrib/i386/floppies/inst-common/dot.commonutils b/distrib/i386/floppies/inst-common/dot.commonutils
index d69cac9805a..66e7a0a4db7 100644
--- a/distrib/i386/floppies/inst-common/dot.commonutils
+++ b/distrib/i386/floppies/inst-common/dot.commonutils
@@ -1,4 +1,4 @@
-#       $OpenBSD: dot.commonutils,v 1.4 1996/04/25 21:28:12 niklas Exp $
+#       $OpenBSD: dot.commonutils,v 1.5 1996/06/29 05:54:13 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,5 +127,5 @@ Extract()
 		tarverbose=
 		;;
 	esac
-	cat "$1"* | $GUNZIP | (cd $dest_dir ; $TAR  --unlink -xp"$tarverbose"f - )
+	cat "$1"* | $GUNZIP | (cd $dest_dir ; $TAR -xp"$tarverbose"f - )
 }
diff --git a/distrib/i386/floppies/inst-common/instbin.conf b/distrib/i386/floppies/inst-common/instbin.conf
index e4eea0e157f..f5c8a77e7ba 100644
--- a/distrib/i386/floppies/inst-common/instbin.conf
+++ b/distrib/i386/floppies/inst-common/instbin.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: instbin.conf,v 1.7 1996/06/16 10:25:17 deraadt Exp $
+#	$OpenBSD: instbin.conf,v 1.8 1996/06/29 05:54:13 tholo Exp $
 #
 # instbin.conf - unified binary for the inst/upgr floppies
 #
@@ -8,14 +8,15 @@ srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
 progs bad144 cat chmod chown chroot cp dd df disklabel ed expr fsck_ffs ftp gawk
 progs gzip ifconfig init less ln ls mkdir mknod mount mount_cd9660
 progs mount_ffs mount_msdos mount_nfs mount_kernfs
-progs mv newfs ping pwd reboot rm route
-progs sed sh shutdown slattach strings stty sync tar test tip umount
+progs mv newfs pax ping pwd reboot rm route
+progs sed sh shutdown slattach strings stty sync test tip umount
 
 ln chown chgrp
 ln fsck_ffs fsck
 ln gawk awk
 ln gzip gzcat gunzip
 ln less more
+ln pax tar
 ln sh -sh		# init invokes the shell this way
 ln test [
 ln reboot halt
diff --git a/distrib/i386/floppies/inst-common/list b/distrib/i386/floppies/inst-common/list
index 2c6098094ec..4ca39313f58 100644
--- a/distrib/i386/floppies/inst-common/list
+++ b/distrib/i386/floppies/inst-common/list
@@ -1,4 +1,4 @@
-#	$Id: list,v 1.5 1996/06/16 10:25:18 deraadt Exp $
+#	$Id: list,v 1.6 1996/06/29 05:54:14 tholo Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin	instbin
@@ -18,6 +18,7 @@ LINK	instbin			bin/rm
 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/disklabel
@@ -48,7 +49,6 @@ SYMLINK	/bin/cat		usr/bin/gzip
 SYMLINK	/bin/cat		usr/bin/less
 SYMLINK	/bin/cat		usr/bin/sed
 SYMLINK	/bin/cat		usr/bin/strings
-SYMLINK	/bin/cat		usr/bin/tar
 SYMLINK	/bin/cat		usr/bin/tip
 SYMLINK	/bin/cat		usr/sbin/bad144
 SYMLINK	/bin/cat		usr/sbin/chown
diff --git a/distrib/i386/floppies/inst/install.sh b/distrib/i386/floppies/inst/install.sh
index da843327d96..bbe5933a5dd 100644
--- a/distrib/i386/floppies/inst/install.sh
+++ b/distrib/i386/floppies/inst/install.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: install.sh,v 1.6 1996/04/25 21:28:08 niklas Exp $
+#	$OpenBSD: install.sh,v 1.7 1996/06/29 05:54:12 tholo Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -458,7 +458,7 @@ fi
 
 echo	""
 echo    "Populating filesystems with bootstrapping binaries and config files"
-$DONTDOIT tar --one-file-system -cf - . | (cd /mnt ; tar --unlink -xpf - )
+$DONTDOIT tar -cfX - . | (cd /mnt ; tar -xpf - )
 $DONTDOIT cp /tmp/.hdprofile /mnt/.profile
 
 echo	""
diff --git a/distrib/i386/floppies/upgr/upgrade.sh b/distrib/i386/floppies/upgr/upgrade.sh
index fbfa4c121dc..045705943c2 100644
--- a/distrib/i386/floppies/upgr/upgrade.sh
+++ b/distrib/i386/floppies/upgr/upgrade.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: upgrade.sh,v 1.4 1996/04/25 21:28:32 niklas Exp $
+#	$OpenBSD: upgrade.sh,v 1.5 1996/06/29 05:54:14 tholo Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -229,7 +229,7 @@ echo	"Done."
 echo	""
 echo	"Copying bootstrapping binaries and config files to the hard drive..."
 $DONTDOIT cp /mnt/.profile /mnt/.profile.bak
-$DONTDOIT tar --exclude etc --one-file-system -cf - . | (cd /mnt ; tar --unlink -xpf - )
+$DONTDOIT pax -rw -X -k . /mnt
 $DONTDOIT mv /mnt/etc/rc /mnt/etc/rc.bak
 $DONTDOIT cp /tmp/.hdprofile /mnt/.profile
 
diff --git a/distrib/mac68k/inst-common/list b/distrib/mac68k/inst-common/list
index fa18961bb4f..657196aa566 100644
--- a/distrib/mac68k/inst-common/list
+++ b/distrib/mac68k/inst-common/list
@@ -21,6 +21,7 @@ LINK	raminst			bin/sh
 LINK	raminst			bin/-sh
 LINK	raminst			bin/stty
 LINK	raminst			bin/sync
+LINK	raminst			bin/tar
 LINK	raminst			bin/test
 LINK	raminst			bin/[
 LINK	raminst			sbin/disklabel
@@ -48,7 +49,6 @@ LINK	raminst			usr/bin/more
 LINK	raminst			usr/bin/printf
 LINK	raminst			usr/bin/sed
 LINK	raminst			usr/bin/strings
-LINK	raminst			usr/bin/tar
 LINK	raminst			usr/bin/tip
 LINK	raminst			usr/sbin/chown
 LINK	raminst			usr/sbin/chroot
diff --git a/distrib/mac68k/inst-common/raminst.conf b/distrib/mac68k/inst-common/raminst.conf
index 55c01cc0543..5e482bf614a 100644
--- a/distrib/mac68k/inst-common/raminst.conf
+++ b/distrib/mac68k/inst-common/raminst.conf
@@ -9,12 +9,13 @@ srcdirs /usr/src/gnu/usr.bin
 
 progs cat chmod chown chroot cp dd df disklabel ed expr fsck ftp 
 progs gzip ifconfig init halt ln ls mkdir mknod more mount mount_cd9660
-progs mount_ffs mount_msdos mount_nfs mv newfs printf pwd reboot rm route
-progs sed sh shutdown slattach strings stty sync tar test tip umount update
+progs mount_ffs mount_msdos mount_nfs mv newfs pax printf pwd reboot rm route
+progs sed sh shutdown slattach strings stty sync test tip umount update
 
 ln chown chgrp
 ln gzip gzcat gunzip
 ln sh -sh		# init invokes the shell this way
+ln pax tar
 ln test [
 ln mount_ffs ffs
 
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index f4b196861fa..a48d9a7155c 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: install.sub,v 1.2 1996/03/28 21:48:19 niklas Exp $
+#	$OpenBSD: install.sub,v 1.3 1996/06/29 05:54:16 tholo Exp $
 #	$NetBSD: install.sub,v 1.2 1996/02/28 00:47:43 thorpej Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -423,7 +423,7 @@ __install_ftp_2
 		fi
 
 		_ftp_file=`echo ${resp} | awk '{print $1}'`
-		echo "get ${_ftp_file} |\"tar --unlink -zxvpf -\"" >> \
+		echo "get ${_ftp_file} |\"tar -xzvpf -\"" >> \
 		    /tmp/ftp-script.sh
 	done
 
@@ -487,7 +487,7 @@ install_common_nfs_cdrom() {
 		fi
 
 		# Extract file
-		cat $_filename | (cd /mnt; tar -zxvpf -)
+		cat $_filename | (cd /mnt; tar -xzvpf -)
 		echo "Extraction complete."
 		_setsdone="$_f $_setsdone"
 
@@ -712,14 +712,14 @@ __install_tape_2
 			1)
 				(
 					cd /mnt
-					dd if=$TAPE | tar --unlink -zxvpf -
+					dd if=$TAPE | tar -xzvpf -
 				)
 				;;
 
 			2)
 				(
 					cd /mnt
-					dd if=$TAPE | tar --unlink -xvpf -
+					dd if=$TAPE | tar -xzvpf -
 				)
 				;;
 
@@ -814,7 +814,7 @@ if [ -f $RELDIR/$1.tar.gz ]; then
 			case "$resp" in
 			y*|Y*)
 			     cat $RELDIR/${_f}.tar.gz |
-					(cd /mnt; tar --unlink -zxvpf -)
+					(cd /mnt; tar -xzvpf -)
 				_yup="TRUE"
 				echo "Extraction complete."
 				;;
diff --git a/distrib/miniroot/list b/distrib/miniroot/list
index 2859cbc8e80..44f3fd33a32 100644
--- a/distrib/miniroot/list
+++ b/distrib/miniroot/list
@@ -22,6 +22,7 @@ LINK	instbin			bin/sh
 LINK	instbin			bin/stty
 LINK	instbin			bin/sleep
 LINK	instbin			bin/sync
+LINK	instbin			bin/tar
 LINK	instbin			bin/test
 LINK	instbin			bin/[
 LINK	instbin			sbin/disklabel
@@ -60,7 +61,6 @@ SYMLINK	../../instbin		usr/bin/rsh
 SYMLINK	../../instbin		usr/bin/sed
 SYMLINK	../../instbin		usr/bin/strings
 SYMLINK	../../instbin		usr/bin/sort
-SYMLINK	../../instbin		usr/bin/tar
 SYMLINK	../../instbin		usr/bin/tip
 SYMLINK	../../instbin		usr/bin/tset
 SYMLINK	../../instbin		usr/bin/vi
diff --git a/distrib/notes/hp300/upgrade b/distrib/notes/hp300/upgrade
index b48a8225957..e236af3951e 100644
--- a/distrib/notes/hp300/upgrade
+++ b/distrib/notes/hp300/upgrade
@@ -66,7 +66,7 @@ manually.  To do this, follow the following procedure:
 	  the `base' binary set:
 
 		cd /
-		tar --unlink -zxvpf /path/to/base11.tar.gz
+		tar -xzvpf /path/to/base11.tar.gz
 
 	  NOTE: the `--unlink' option is _very_ important!
 
@@ -85,7 +85,7 @@ manually.  To do this, follow the following procedure:
 	  To extract these sets, use the following commands:
 
 		cd /
-		tar --unlink -zxvpf <path to set>
+		tar -xzvpf <path to set>
 
 NOTE: you SHOULD NOT extract the `etc' set if upgrading.  Instead, you
 should extract that set into another area and carefully merge the changes
diff --git a/distrib/notes/pc532/install b/distrib/notes/pc532/install
index b4fb2082160..4ebe7fae92f 100644
--- a/distrib/notes/pc532/install
+++ b/distrib/notes/pc532/install
@@ -166,13 +166,9 @@ The Install Procedure:
 	in a directory /gz.files, to extract base.tar.gz you would:
 
 	- cd / 
-	- tar -xpzf /gz.files/base.tar.gz --unlink
+	- tar -xpzf /gz.files/base.tar.gz
 
 	Add v to the flags if you want a verbose extract.
-	The --unlink is to make sure that the install versions
-	of sh, init, ... are replaced by their proper versons
-	in base.tar.gz.  I think it is wise to include the --unlink
-	for other things.
 
   j) Extract at least "base" and "etc" for a new installation.  For
 	"update" extracts, don't extract "etc" directly unless you 
diff --git a/distrib/notes/pc532/upgrade b/distrib/notes/pc532/upgrade
index 5d3c23e9424..5ebc383497a 100644
--- a/distrib/notes/pc532/upgrade
+++ b/distrib/notes/pc532/upgrade
@@ -20,12 +20,10 @@ To upgrade your system, follow the following instructions:
 	from /bin, /sbin and /usr/bin in some directory.  (Things like
 	sh, cp, ls, rm, tar, halt, and others.)
 
-	Extract the tar.gz files.  Remember to use the --unlink
-	option with tar so it can replace binaries currently in use.
-	For example, to extract base.tar.gz:
+	Extract the tar.gz files.  For example, to extract base.tar.gz:
 
 		cd / 
-		tar -xpzf /gz.files/base.tar.gz --unlink
+		tar -xpzf /gz.files/base.tar.gz
 
 	Extract all the tar.gz files you want.  You should carefully
 	work at upgrading /etc.  There may be changes to file formats
diff --git a/distrib/notes/sun3/upgrade b/distrib/notes/sun3/upgrade
index 9cbec98dfad..bbc2f0317a1 100644
--- a/distrib/notes/sun3/upgrade
+++ b/distrib/notes/sun3/upgrade
@@ -41,9 +41,7 @@ Manual upgrade procedure:
 	  the `base' binary set:
 
 		cd /
-		tar --unlink -zxvpf /path/to/base11.tar.gz
-
-	  NOTE: the `--unlink' option is _very_ important!
+		tar -xzvpf /path/to/base11.tar.gz
 
 	* Install a new boot block:
 
@@ -63,7 +61,7 @@ Manual upgrade procedure:
 	  To extract these sets, use the following commands:
 
 		cd /
-		tar --unlink -zxvpf <path to set>
+		tar -xzvpf <path to set>
 
 NOTE: you SHOULD NOT extract the `etc' set if upgrading.  Instead,
 you should extract that set into another area and carefully merge
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
diff --git a/distrib/pc532/floppies/inst/install.sh b/distrib/pc532/floppies/inst/install.sh
index 0a829b1c7e0..83fc6fbc02d 100644
--- a/distrib/pc532/floppies/inst/install.sh
+++ b/distrib/pc532/floppies/inst/install.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: install.sh,v 1.4 1996/04/25 21:30:29 niklas Exp $
+#	$OpenBSD: install.sh,v 1.5 1996/06/29 05:54:20 tholo Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -432,7 +432,7 @@ fi
 
 echo	""
 echo    "Populating filesystems with bootstrapping binaries and config files"
-$DONTDOIT tar --one-file-system -cf - . | (cd /mnt ; tar --unlink -xpf - )
+$DONTDOIT tar -cfX - . | (cd /mnt ; tar -xpf - )
 $DONTDOIT cp /tmp/.hdprofile /mnt/.profile
 $DONTDOIT gzip -d /mnt/bsd.gz
 
diff --git a/distrib/pc532/floppies/upgr/upgrade.sh b/distrib/pc532/floppies/upgr/upgrade.sh
index 5fc83836b9a..645dccac5a2 100644
--- a/distrib/pc532/floppies/upgr/upgrade.sh
+++ b/distrib/pc532/floppies/upgr/upgrade.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: upgrade.sh,v 1.2 1996/04/25 21:30:59 niklas Exp $
+#	$OpenBSD: upgrade.sh,v 1.3 1996/06/29 05:54:21 tholo Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -229,7 +229,7 @@ echo	"Done."
 echo	""
 echo	"Copying bootstrapping binaries and config files to the hard drive..."
 $DONTDOIT cp /mnt/.profile /mnt/.profile.bak
-$DONTDOIT tar --exclude etc --one-file-system -cf - . | (cd /mnt ; tar --unlink -xpf - )
+$DONTDOIT pax -rw -X -k . /mnt
 $DONTDOIT mv /mnt/etc/rc /mnt/etc/rc.bak
 $DONTDOIT cp /tmp/.hdprofile /mnt/.profile
 
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index f70d5027b3d..41b71ed833e 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -31,6 +31,7 @@
 ./bin/sleep
 ./bin/stty
 ./bin/sync
+./bin/tar
 ./bin/test
 ./dev
 ./dev/MAKEDEV
@@ -276,7 +277,6 @@
 ./usr/bin/systat
 ./usr/bin/tail
 ./usr/bin/talk
-./usr/bin/tar
 ./usr/bin/tcopy
 ./usr/bin/tee
 ./usr/bin/telnet
diff --git a/distrib/sparc/floppies/inst-common/dot.commonutils b/distrib/sparc/floppies/inst-common/dot.commonutils
index aaa436bf92a..b9bb0681bbc 100644
--- a/distrib/sparc/floppies/inst-common/dot.commonutils
+++ b/distrib/sparc/floppies/inst-common/dot.commonutils
@@ -1,4 +1,4 @@
-#	$OpenBSD: dot.commonutils,v 1.2 1996/04/25 21:31:24 niklas Exp $
+#	$OpenBSD: dot.commonutils,v 1.3 1996/06/29 05:54:24 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 xvpf --unlink /dev/$which
+	$TAR xvpf /dev/$which
 	echo	"Done."
 }
 
@@ -127,5 +127,5 @@ Extract()
 		tarverbose=
 		;;
 	esac
-	cat "$1"* | $GUNZIP | (cd $dest_dir ; $TAR  --unlink -xp"$tarverbose"f - )
+	cat "$1"* | $GUNZIP | (cd $dest_dir ; $TAR -xp"$tarverbose"f - )
 }
diff --git a/distrib/sparc/floppies/inst-common/instbin.conf b/distrib/sparc/floppies/inst-common/instbin.conf
index 615dcac23f4..d149342f7bb 100644
--- a/distrib/sparc/floppies/inst-common/instbin.conf
+++ b/distrib/sparc/floppies/inst-common/instbin.conf
@@ -1,19 +1,20 @@
 #
 # kcbin.conf - unified binary for the kc floppy
-# $Id: instbin.conf,v 1.1 1995/10/27 22:39:57 deraadt Exp $	
+# $Id: instbin.conf,v 1.2 1996/06/29 05:54:24 tholo Exp $	
 #
 
 srcdirs bin sbin usr.bin usr.sbin gnu/usr.bin
 
 progs bad144 cat chmod chown chroot cp dd df disklabel ed expr fsck ftp gawk
 progs gzip ifconfig init ln ls mkdir mknod more mount mount_cd9660
-progs mount_ffs mount_msdos mount_nfs mv newfs ping pwd reboot rm route
-progs sed sh shutdown slattach strings stty sync tar test tip umount
+progs mount_ffs mount_msdos mount_nfs mv newfs pax ping pwd reboot rm route
+progs sed sh shutdown slattach strings stty sync test tip umount
 progs update
 
 ln chown chgrp
 ln gawk awk
 ln gzip gzcat gunzip
+ln pax tar
 ln sh -sh		# init invokes the shell this way
 ln test [
 ln mount_cd9660 cd9660
diff --git a/distrib/sparc/floppies/inst-common/list b/distrib/sparc/floppies/inst-common/list
index 077b011e73c..9fdceb6e215 100644
--- a/distrib/sparc/floppies/inst-common/list
+++ b/distrib/sparc/floppies/inst-common/list
@@ -1,4 +1,4 @@
-#	$Id: list,v 1.1 1995/10/27 22:39:58 deraadt Exp $
+#	$Id: list,v 1.2 1996/06/29 05:54:25 tholo Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin	instbin
@@ -18,6 +18,7 @@ LINK	instbin			bin/rm
 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/disklabel
@@ -47,7 +48,6 @@ 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/tar
 SYMLINK	/bin/cat		usr/bin/tip
 #SYMLINK /bin/cat		usr/sbin/bad144
 SYMLINK	/bin/cat		usr/sbin/chown
diff --git a/distrib/sparc/floppies/inst/install.sh b/distrib/sparc/floppies/inst/install.sh
index 4142d3b6042..8d5313be8db 100644
--- a/distrib/sparc/floppies/inst/install.sh
+++ b/distrib/sparc/floppies/inst/install.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: install.sh,v 1.2 1996/04/25 21:31:19 niklas Exp $
+#	$OpenBSD: install.sh,v 1.3 1996/06/29 05:54:23 tholo Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -441,7 +441,7 @@ fi
 
 echo	""
 echo    "Populating filesystems with bootstrapping binaries and config files"
-$DONTDOIT tar --one-file-system -cf - . | (cd /mnt ; tar --unlink -xpf - )
+$DONTDOIT tar -cfX - . | (cd /mnt ; tar -xpf - )
 $DONTDOIT cp /tmp/.hdprofile /mnt/.profile
 
 echo	""
diff --git a/distrib/sparc/floppies/upgr/upgrade.sh b/distrib/sparc/floppies/upgr/upgrade.sh
index c4a0071fde4..b54430017bc 100644
--- a/distrib/sparc/floppies/upgr/upgrade.sh
+++ b/distrib/sparc/floppies/upgr/upgrade.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: upgrade.sh,v 1.2 1996/04/25 21:31:35 niklas Exp $
+#	$OpenBSD: upgrade.sh,v 1.3 1996/06/29 05:54:25 tholo Exp $
 #
 # Copyright (c) 1994 Christopher G. Demetriou
 # All rights reserved.
@@ -229,7 +229,7 @@ echo	"Done."
 echo	""
 echo	"Copying bootstrapping binaries and config files to the hard drive..."
 $DONTDOIT cp /mnt/.profile /mnt/.profile.bak
-$DONTDOIT tar --exclude etc --one-file-system -cf - . | (cd /mnt ; tar --unlink -xpf - )
+$DONTDOIT pax -rw -X -k . /mnt
 $DONTDOIT mv /mnt/etc/rc /mnt/etc/rc.bak
 $DONTDOIT cp /tmp/.hdprofile /mnt/.profile
 
diff --git a/distrib/sun3/common/install.sh b/distrib/sun3/common/install.sh
index de309d01665..fa72839d4d1 100644
--- a/distrib/sun3/common/install.sh
+++ b/distrib/sun3/common/install.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: install.sh,v 1.4 1996/03/28 21:48:24 niklas Exp $
+#	$OpenBSD: install.sh,v 1.5 1996/06/29 05:54:26 tholo Exp $
 #	$NetBSD: install.sh,v 1.5 1996/02/28 00:52:38 thorpej Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -413,7 +413,7 @@ __install_ftp_2
 		fi
 
 		_ftp_file=`echo ${resp} | awk '{print $1}'`
-		echo "get ${_ftp_file} |\"tar --unlink -zxvpf -\"" >> \
+		echo "get ${_ftp_file} |\"tar -xzvpf -\"" >> \
 		    /tmp/ftp-script.sh
 	done
 
@@ -444,7 +444,7 @@ install_common_nfs_cdrom() {
 	fi
 
 	# Extract file
-	cat $_common_filename | (cd /mnt; tar --unlink -zxvpf -)
+	cat $_common_filename | (cd /mnt; tar -xzvpf -)
 	echo "Extraction complete."
 }
 
@@ -664,14 +664,14 @@ __install_tape_2
 			1)
 				(
 					cd /mnt
-					dd if=$TAPE | tar --unlink -zxvpf -
+					dd if=$TAPE | tar -xzvpf -
 				)
 				;;
 
 			2)
 				(
 					cd /mnt
-					dd if=$TAPE | tar --unlink -xvpf -
+					dd if=$TAPE | tar -xzvpf -
 				)
 				;;
 
@@ -1090,7 +1090,7 @@ if [ -f /base.tar.gz ]; then
 				getresp "y"
 				case "$resp" in
 				y*|Y*)
-				     cat $_f | (cd /mnt; tar --unlink -zxvpf -)
+				     cat $_f | (cd /mnt; tar -xzvpf -)
 					_yup="TRUE"
 					;;
 				*)
diff --git a/distrib/sun3/common/mini_xx.list b/distrib/sun3/common/mini_xx.list
index 1b00ab69307..ec1fa44fe12 100644
--- a/distrib/sun3/common/mini_xx.list
+++ b/distrib/sun3/common/mini_xx.list
@@ -19,7 +19,7 @@ COPY	${OBJDIR}/vi			usr/bin
 
 # These are normally -static so just copy:
 
-COPY	${DESTDIR}/usr/bin/tar		usr/bin
+COPY	${DESTDIR}/bin/tar		bin
 
 COPY	${DESTDIR}/usr/bin/gzip		usr/bin
 LINK		   usr/bin/gzip		usr/bin/gunzip
diff --git a/distrib/vax/inst-common/instbin.conf b/distrib/vax/inst-common/instbin.conf
index d8378a91b69..265f54b980c 100644
--- a/distrib/vax/inst-common/instbin.conf
+++ b/distrib/vax/inst-common/instbin.conf
@@ -1,6 +1,6 @@
 #
 # kcbin.conf - unified binary for the kc floppy
-# $Id: instbin.conf,v 1.1 1995/10/18 08:37:54 deraadt Exp $	
+# $Id: instbin.conf,v 1.2 1996/06/29 05:54:27 tholo Exp $	
 #
 
 srcdirs /usr/src/bin /usr/src/sbin /usr/src/usr.bin /usr/src/usr.sbin
@@ -8,8 +8,8 @@ srcdirs /usr/src/gnu/usr.bin
 
 progs gawk cat chmod chown chroot cp df disklabel ed expr fsck ftp 
 progs gzip ifconfig init ln ls mkdir mknod more mount mt dd
-progs mount_ffs mount_nfs mv newfs reboot rm route sed sh shutdown
-progs slattach strings stty sync tar test umount update
+progs mount_ffs mount_nfs mv newfs pax reboot rm route sed sh shutdown
+progs slattach strings stty sync test umount update
 
 ln chown chgrp
 ln gzip gzcat gunzip
@@ -17,6 +17,7 @@ ln mount_ffs ffs
 ln mount_nfs nfs
 ln gawk awk
 ln sh -sh		# init invokes the shell this way
+ln pax tar
 ln test [
 ln reboot halt
 
diff --git a/distrib/vax/inst-common/list b/distrib/vax/inst-common/list
index 55f73a9c528..b743b57aa1a 100644
--- a/distrib/vax/inst-common/list
+++ b/distrib/vax/inst-common/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.2 1996/04/25 21:32:16 niklas Exp $
+#	$OpenBSD: list,v 1.3 1996/06/29 05:54:28 tholo Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin	instbin
@@ -19,6 +19,7 @@ LINK	instbin			bin/sh
 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/disklabel
@@ -45,7 +46,6 @@ LINK	instbin			usr/bin/gzip
 LINK	instbin			usr/bin/more
 LINK	instbin			usr/bin/sed
 LINK	instbin			usr/bin/strings
-LINK	instbin			usr/bin/tar
 # LINK	instbin			usr/sbin/bad144
 LINK	instbin			usr/sbin/chown
 LINK	instbin			usr/sbin/chroot