Update for removal of GNU tar(1)

4 files changed, 16 insertions, 15 deletions

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"
 					;;
 				*)