diff options
Diffstat (limited to 'distrib/miniroot')
| -rw-r--r-- | distrib/miniroot/install.sh | 14 | ||||
| -rw-r--r-- | distrib/miniroot/install.sub | 35 |
2 files changed, 24 insertions, 25 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index 434e0bbb7fa..e2c0c6c45ac 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sh,v 1.65 1999/10/14 17:19:42 deraadt Exp $ +# $OpenBSD: install.sh,v 1.66 1999/10/14 17:29:04 deraadt Exp $ # $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $ # # Copyright (c) 1997,1998 Todd Miller, Theo de Raadt @@ -539,7 +539,7 @@ install_sets $THESETS # XXX # XXX should loop until successful install or user abort # XXX -if [ X"$libssl" != X1 ]; then +if [ X"$ssl" != X1 ]; then resp= while [ X"${resp}" = X ]; do echo @@ -551,13 +551,13 @@ if [ X"$libssl" != X1 ]; then echo "functional as a result. Libraries which _include_ the troublesome routines" echo "are available and can be FTP installed, as long as you meet the follow (legal)" echo "criteria:" - echo " (1) Outside the USA, no restrictions apply. Use libssl${VERSION}.tar.gz." - echo " (2) Inside the USA, non-commercial entities may install libsslUSA${VERSION}.tar.gz." + echo " (1) Outside the USA, no restrictions apply. Use ssl${VERSION}.tar.gz." + echo " (2) Inside the USA, non-commercial entities may install sslUSA${VERSION}.tar.gz." echo " (3) Commercial entities in the USA are left in the cold, due to how the" echo " licences work. (This is how the USA crypto export policy feels to the" echo " rest of the world.)" echo "" - echo "If you do not install the libssl package now, it is easily installed at + echo "If you do not install the ssl package now, it is easily installed at echo "a later time (see the afterboot(8) and ssl(8) manual pages)." echo -n "Install SSL+RSA libraries now via (f)tp, (h)ttp, or (n)ot? [$resp] " @@ -567,7 +567,7 @@ if [ X"$libssl" != X1 ]; then # configure network if necessary test -n "$_ifs" && configurenetwork - THESETS=libssl + THESETS=ssl install_url -ftp -reuse resp=f ;; @@ -575,7 +575,7 @@ if [ X"$libssl" != X1 ]; then # configure network if necessary test -n "$_ifs" && configurenetwork - THESETS=libssl + THESETS=ssl install_url -http -reuse resp=h ;; diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 4622029f231..589078c61ce 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sub,v 1.136 1999/10/14 17:17:46 millert Exp $ +# $OpenBSD: install.sub,v 1.137 1999/10/14 17:29:04 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 @@ -74,8 +74,8 @@ VERSION_MAJOR=$(( $VERSION / 10 )) VERSION_MINOR=$(( $VERSION % 10 )) export VERSION VERSION_MAJOR VERSION_MINOR -ALLSETS="base etc misc comp man game xbase xshare xfont xserv libssl" # install -UPGRSETS="base misc comp man game xbase xshare xfont xserv libssl" # upgrade +ALLSETS="base etc misc comp man game xbase xshare xfont xserv" # install +UPGRSETS="base misc comp man game xbase xshare xfont xserv" # upgrade SNAPSETS="bin dev etc games man misc sbin \ usr.bin usr.binutils usr.games usr.include \ usr.lib usr.libexec usr.misc usr.sbin usr.share var" @@ -1039,15 +1039,14 @@ fi # Yes, all those blackslashes really are necesary... eval echo "\\\\n"\ -"You will now be asked for files to extract. In addition to the\\\\n"\ -"files listed in the selector you may enter any file located at\\\\n"\ -"\$_${_url_type}_server_ip:\$_${_url_type}_server_dir. You can also enter\\\\n"\ -"'all' to install all the standard sets, or 'list' to list the\\\\n"\ -"files avilable at \$_${_url_type}_server_ip:\$_${_url_type}_server_dir.\\\\n"\ -"When you are done selecting files, enter 'done'.\\\\n"\ -"Some of these sets are required for your ${MODE} and some are optional --\\\\n"\ -"You will want at least the base and bsd sets.\\\\n"\ -"Consult the installation notes if you are not sure which sets are required!" +"You will now be asked for files to extract. In addition to the files listed,\\\\n"\ +"you may select any file located at\\\\n"\ +" \$_${_url_type}_server_ip:\$_${_url_type}_server_dir\\\\n"\ +"You can also enter \'all\' to install all the standard sets, or \'list\' to list\\\\n"\ +"the files available. When you are done selecting files, enter \'done\'. Some of\\\\n"\ +"these sets are required for your ${MODE} and some are optional -- you will want at\\\\n"\ +"least the base and bsd sets. Consult the installation notes if you are not sure\\\\n"\ +"which sets are required!" _osetsdone="$_setsdone" # Set a minimal default for _f in $_sets $_kernel; do @@ -1109,7 +1108,7 @@ while test -n "${_get_files}" ; do echo for _f in $_get_files ; do echo "Getting ${_f} ..." - if [ "X${_f}" = "Xlibssl${VERSION}.tar.gz" ]; then + if [ "X${_f}" = "Xssl${VERSION}.tar.gz" ]; 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 ( cd /mnt ; ftp ${_ftp_active} -V -m ${_url_base}/${_f} ) @@ -1120,8 +1119,8 @@ while test -n "${_get_files}" ; do # Mark xfer as having failed,. _setsdone=`rmel $_f $_setsdone` _failed_files="${_failed_files} ${_f}" - elif [ "X${_f}" = "Xlibssl${VERSION}.tar.gz" ]; then - libssl=1 + elif [ "X${_f}" = "Xssl${VERSION}.tar.gz" ]; then + ssl=1 fi done @@ -1266,7 +1265,7 @@ while test -n "${_get_files}" ; do echo for _f in $_get_files ; do echo "$1/${_f}:" - if [ "X${_f}" = "Xlibssl${VERSION}.tar.gz" ]; then + if [ "X${_f}" = "Xssl${VERSION}.tar.gz" ]; 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 ftp -V -m -o /mnt/$_f file:$1/$_f @@ -1277,8 +1276,8 @@ while test -n "${_get_files}" ; do # Mark xfer as having failed,. _setsdone=`rmel $_f $_setsdone` _failed_files="${_failed_files} ${_f}" - elif [ "X${_f}" = "Xlibssl${VERSION}.tar.gz" ]; then - libssl=1 + elif [ "X${_f}" = "Xssl${VERSION}.tar.gz" ]; then + ssl=1 fi done |