summaryrefslogtreecommitdiff
path: root/distrib/miniroot
diff options
context:
space:
mode:
authorAlexander Hall <halex@cvs.openbsd.org>2012-10-20 22:40:26 +0000
committerAlexander Hall <halex@cvs.openbsd.org>2012-10-20 22:40:26 +0000
commit00b94da21cb99156c7c04c66994ab24c4a2b7118 (patch)
tree82f14b468575713c3feb0dcee2f28d5580f24106 /distrib/miniroot
parent28c7a54c1c98748c7cc989decd0ca1caf9365a43 (diff)
waitftplist:
- simplify - remove excess comments - reduce verbosity ok deraadt@ rpe@
Diffstat (limited to 'distrib/miniroot')
-rw-r--r--distrib/miniroot/install.sub13
1 files changed, 2 insertions, 11 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 9c447512cbe..90df8cd09b2 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.668 2012/10/01 18:49:13 rpe Exp $
+# $OpenBSD: install.sub,v 1.669 2012/10/20 22:40:25 halex 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
@@ -1257,17 +1257,8 @@ startftplist() {
}
# Wait for the ftp process to finish, or be killed after the timeout
-# XXX contains a bit of debug code for now
waitftplist() {
- local _dot # XXX
-
- [[ -z $ftppid ]] && return
- while [[ -n $(jobs $ftppid 2>/dev/null) ]]; do
- echo -n . # XXX
- _dot=. # XXX
- sleep 0.2 # XXX
- done
- [[ -n $_dot ]] && echo # XXX
+ wait "$ftppid" 2>/dev/null
}
# If possible, print the timestamp received from the ftplist.cgi output,