diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-05-30 20:41:00 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-05-30 20:41:00 +0000 |
| commit | 46fed973a86fb9ce5d506bcab702eb3bfbb729cf (patch) | |
| tree | f0f12de6024e6ad38180c939d17afc0bddf56ced /distrib/miniroot/install.sub | |
| parent | c38022cf2859d8da5beebdb6635a3be42b7718be (diff) | |
Defer talking to the ftpinstall cgi until a fair bit later, so that we can
also tell it the timezone. As a result, this will also work for non-url
based installs.
Diffstat (limited to 'distrib/miniroot/install.sub')
| -rw-r--r-- | distrib/miniroot/install.sub | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index d58b8ae0d79..19a403bac02 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.559 2009/05/30 19:32:20 deraadt Exp $ +# $OpenBSD: install.sub,v 1.560 2009/05/30 20:40:59 deraadt 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 @@ -1236,13 +1236,8 @@ install_url() { install_files "$_url_base" "$_file_list" - # Tell the FTP server what location we used... so it can perform magic - if [[ -s $SERVERLIST ]]; then - eval _url_base=$_url_type://\$_${_url_type}_server_ip/\$_${_url_type}_server_dir - ftp $FTPOPTS -a -o - \ - "http://129.128.5.191/cgi-bin/ftpinstall.cgi?install=$_url_base" \ - >/dev/null 2>&1 & - fi + # Remember where we installed from + eval installedfrom=$_url_type://\$_${_url_type}_server_ip/\$_${_url_type}_server_dir } install_mounted_fs() { |