diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2000-06-16 03:19:43 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2000-06-16 03:19:43 +0000 |
| commit | e3f37480afd9f20e88b51c3f2e549e782316dd9e (patch) | |
| tree | c9dee01c9e851a3dfa321db7eee7db3cf32e153d /distrib/miniroot/install.sub | |
| parent | 13a95bd3b3d49df621d9edf80db91ddfffdf3eb9 (diff) | |
ssl package no longer needed (will be tested)
Diffstat (limited to 'distrib/miniroot/install.sub')
| -rw-r--r-- | distrib/miniroot/install.sub | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 8c87d2811e0..2c2d6914e6f 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sub,v 1.153 2000/05/08 21:28:03 millert Exp $ +# $OpenBSD: install.sub,v 1.154 2000/06/16 03:19:42 deraadt Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997,1998 Todd Miller, Theo de Raadt @@ -1133,10 +1133,7 @@ while test -n "${_get_files}" ; do echo for _f in $_get_files ; do echo "Getting ${_f} ..." - if [ "X${_f}" = "Xssl${VERSION}.tgz" -o \ - "X${_f}" = "XsslUSA${VERSION}.tgz" ]; then - ( cd /mnt ; ftp ${_ftp_active} -o - -V -m ${_url_base}/${_f} | /mnt/usr/sbin/chroot /mnt /usr/sbin/pkg_add -I -) - elif [ "X${_f}" = "X${_kernel}" ]; then + if [ "X${_f}" = "X${_kernel}" ]; then ( cd /mnt ; ftp ${_ftp_active} -V -m ${_url_base}/${_f} ) else ( cd /mnt ; ftp ${_ftp_active} -o - -V -m ${_url_base}/${_f} | tar zxpf - ) @@ -1145,9 +1142,6 @@ while test -n "${_get_files}" ; do # Mark xfer as having failed,. _setsdone=`rmel $_f $_setsdone` _failed_files="${_failed_files} ${_f}" - elif [ "X${_f}" = "Xssl${VERSION}.tgz" -o \ - "X${_f}" = "XsslUSA${VERSION}.tz" ]; then - ssl=1 fi done @@ -1292,10 +1286,7 @@ while test -n "${_get_files}" ; do echo for _f in $_get_files ; do echo "$1/${_f}:" - if [ "X${_f}" = "Xssl${VERSION}.tgz" -o \ - "X${_f}" = "XsslUSA${VERSION}.tgz" ]; then - ( cd /mnt ; ftp -o - -V -m file:$1/${_f} | /mnt/usr/sbin/chroot /mnt /usr/sbin/pkg_add -I -) - elif [ "X${_f}" = "X${_kernel}" ]; then + if [ "X${_f}" = "X${_kernel}" ]; then ftp -V -m -o /mnt/$_f file:$1/$_f else ftp -V -m -o - file:$1/$_f | (cd /mnt; tar -zxpf -) @@ -1304,9 +1295,6 @@ while test -n "${_get_files}" ; do # Mark xfer as having failed,. _setsdone=`rmel $_f $_setsdone` _failed_files="${_failed_files} ${_f}" - elif [ "X${_f}" = "Xssl${VERSION}.tgz" -o \ - "X${_f}" = "XsslUSA${VERSION}.tgz" ]; then - ssl=1 fi done |