diff options
Diffstat (limited to 'distrib/amiga')
| -rw-r--r-- | distrib/amiga/floppies/inst-common/dot.commonutils | 8 | ||||
| -rw-r--r-- | distrib/amiga/floppies/inst-common/instbin.conf | 7 | ||||
| -rw-r--r-- | distrib/amiga/floppies/inst-common/list | 4 | ||||
| -rw-r--r-- | distrib/amiga/floppies/upgr/upgrade.sh | 4 |
4 files changed, 12 insertions, 11 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..." |