diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1997-05-16 03:07:40 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1997-05-16 03:07:40 +0000 |
| commit | 55b34fd17edd51ff1a26fa5e905cd1e79935478a (patch) | |
| tree | d60ba97877b03c90bf90ed4e3086f951fc311d17 | |
| parent | 8443886a696fefa8e1d6c1948238849fb2cb8186 (diff) | |
proxy-ftp install needs to use index.txt too
| -rw-r--r-- | distrib/miniroot/install.sub | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 4bcf27810aa..49bfbf59724 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sub,v 1.28 1997/05/16 02:00:22 millert Exp $ +# $OpenBSD: install.sub,v 1.29 1997/05/16 03:07:39 millert Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -691,10 +691,10 @@ install_url() { # Get list of files from the server. # XXX - check for nil $_file_list and deal - if [ "${_url_type}" = "ftp" ]; then + if [ "${_url_type}" = "ftp" -a "X${ftp_proxy}" = X"" ]; then _file_list=`ftp_list_files "$_ftp_server_ip" "$_ftp_server_login" "$_ftp_server_password" "$_ftp_server_dir"` else - # Assumes index file is "index.txt" for http + # Assumes index file is "index.txt" for http (or proxy) # We can't use index.html since the format is server-dependent _file_list="`eval ftp -V ${_url_type}://\\$_${_url_type}_server_ip/\\$_${_url_type}_server_dir/index.txt | cat`" fi |