Date: Tue, 19 Apr 2011 13:54:51 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r220834 - head/usr.sbin/bsdinstall/scripts Message-ID: <201104191354.p3JDspwJ009770@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104191354.p3JDspwJ009770>