From owner-svn-src-head@FreeBSD.ORG  Tue Apr 19 13:54:51 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8DBAD1065670;
	Tue, 19 Apr 2011 13:54:51 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7CDCB8FC16;
	Tue, 19 Apr 2011 13:54:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p3JDspnD009773;
	Tue, 19 Apr 2011 13:54:51 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3JDspwJ009770;
	Tue, 19 Apr 2011 13:54:51 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201104191354.p3JDspwJ009770@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 19 Apr 2011 13:54:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220834 - head/usr.sbin/bsdinstall/scripts
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Apr 2011 13:54:51 -0000

Author: nwhitehorn
Date: Tue Apr 19 13:54:51 2011
New Revision: 220834
URL: http://svn.freebsd.org/changeset/base/220834

Log:
  Fix mirror selection, which was broken by stderr redirection.
  
  Reported by:	Garrett Cooper

Modified:
  head/usr.sbin/bsdinstall/scripts/auto
  head/usr.sbin/bsdinstall/scripts/jail

Modified: head/usr.sbin/bsdinstall/scripts/auto
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/auto	Tue Apr 19 13:19:13 2011	(r220833)
+++ head/usr.sbin/bsdinstall/scripts/auto	Tue Apr 19 13:54:51 2011	(r220834)
@@ -83,7 +83,7 @@ fi
 
 if [ -n "$FETCH_DISTRIBUTIONS" ]; then
 	exec 3>&1
-	BSDINSTALL_DISTSITE=`bsdinstall mirrorselect 2>&1 1>&3`
+	BSDINSTALL_DISTSITE=$(`dirname $0`/mirrorselect 2>&1 1>&3)
 	MIRROR_BUTTON=$?
 	exec 3>&-
 	test $MIRROR_BUTTON -eq 0 || error

Modified: head/usr.sbin/bsdinstall/scripts/jail
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/jail	Tue Apr 19 13:19:13 2011	(r220833)
+++ head/usr.sbin/bsdinstall/scripts/jail	Tue Apr 19 13:54:51 2011	(r220834)
@@ -49,7 +49,7 @@ test ! -d $BSDINSTALL_DISTDIR && mkdir -
 
 if [ ! -f $BSDINSTALL_DISTDIR/MANIFEST -a -z "$BSDINSTALL_DISTSITE" ]; then
 	exec 3>&1
-	BSDINSTALL_DISTSITE=`bsdinstall mirrorselect 2>&1 1>&3`
+	BSDINSTALL_DISTSITE=$(`dirname $0`/mirrorselect 2>&1 1>&3)
 	MIRROR_BUTTON=$?
 	exec 3>&-
 	test $MIRROR_BUTTON -eq 0 || error