Update for removal of GNU tar(1)

5 files changed, 14 insertions, 13 deletions

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