diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2009-05-05 19:36:32 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2009-05-05 19:36:32 +0000 |
| commit | b495df83eb12f40bdde197d60b42c449eb0cb615 (patch) | |
| tree | 7f71821629d69a253a38d1fce46b5fbffc5d0336 /distrib | |
| parent | fc00281133cda43c13f628083337636552178c5b (diff) | |
adjust for ftp -DSMALL changes. been in test kernels tested by many.
ok martynas, deraadt
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/miniroot/install.sub | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 5fc0118f258..d2f02288ed4 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.522 2009/05/05 18:54:40 todd Exp $ +# $OpenBSD: install.sub,v 1.523 2009/05/05 19:36:31 sthen Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -470,17 +470,6 @@ manual_net_cfg() { [[ $resp == y ]] && { echo "Type 'exit' to return to $MODE." ; sh ; } } -# log in via ftp to host $1 as user $2 with password $3 -# and return a list of all files in the directory $4 on stdout -ftp_list_files() { - ftp $FTPOPTS -n "$1" <<__EOT -user "$2" "$3" -cd "$4" -ls -quit -__EOT -} - # Create a device. # # $1 = name of the device to create. @@ -1250,7 +1239,7 @@ install_url() { # Get list of files from the server. if [[ $_url_type == ftp && -z $ftp_proxy ]] ; then - _file_list=$(ftp_list_files "$_ftp_server_ip" "$_ftp_server_login" "$_passwd" "$_ftp_server_dir") + _file_list=$(ftp $FTPOPTS "$_url_base/") ftp_error "Login failed." "$_file_list" && return ftp_error "No such file or directory." "$_file_list" && return else |