summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2009-05-04 22:07:29 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2009-05-04 22:07:29 +0000
commit31ea24b4111b4bd536faab13252cbf473389d513 (patch)
treef560bcb36072fb418e0c21fd2f1e7725846ce35d /distrib
parenta85f534588ac73042d67b87608cb059b4493a8e5 (diff)
Make the http fetcher capable of dealing with more complex index.txt files
Diffstat (limited to 'distrib')
-rw-r--r--distrib/miniroot/install.sub5
1 files changed, 3 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 6c2614af98c..0aa2719a58f 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.519 2009/05/04 21:45:11 deraadt Exp $
+# $OpenBSD: install.sub,v 1.520 2009/05/04 22:07:28 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
@@ -1256,7 +1256,8 @@ install_url() {
else
# Assumes index file is "index.txt" for http (or proxy)
# We can't use index.html since the format is server-dependent
- _file_list=$(ftp $FTPOPTS -o - "$_url_base/index.txt" | sed 's/ //')
+ _file_list=$(ftp $FTPOPTS -o - "$_url_base/index.txt" | \
+ sed -e 's/^.* //' | sed -e 's/ //')
fi
install_files "$_url_base" "$_file_list"