summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authornwhitehorn <nwhitehorn@FreeBSD.org>2011-04-19 13:54:51 +0000
committernwhitehorn <nwhitehorn@FreeBSD.org>2011-04-19 13:54:51 +0000
commit292c1f68a1f62d3cdecadb55a3a67b1f44f1f9f6 (patch)
tree0d2a82860f54bdb3f6d010f8c42c2e872600b7ec /usr.sbin
parentd93813d1b81b89c723bbc607d3ffcc29284cda58 (diff)
downloadFreeBSD-src-292c1f68a1f62d3cdecadb55a3a67b1f44f1f9f6.zip
FreeBSD-src-292c1f68a1f62d3cdecadb55a3a67b1f44f1f9f6.tar.gz
Fix mirror selection, which was broken by stderr redirection.
Reported by: Garrett Cooper
Diffstat (limited to 'usr.sbin')
-rwxr-xr-xusr.sbin/bsdinstall/scripts/auto2
-rwxr-xr-xusr.sbin/bsdinstall/scripts/jail2
2 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto
index b4758ff..c163c2c 100755
--- a/usr.sbin/bsdinstall/scripts/auto
+++ b/usr.sbin/bsdinstall/scripts/auto
@@ -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
diff --git a/usr.sbin/bsdinstall/scripts/jail b/usr.sbin/bsdinstall/scripts/jail
index d596756..78fd4c8 100755
--- a/usr.sbin/bsdinstall/scripts/jail
+++ b/usr.sbin/bsdinstall/scripts/jail
@@ -49,7 +49,7 @@ test ! -d $BSDINSTALL_DISTDIR && mkdir -p $BSDINSTALL_DISTDIR
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
OpenPOWER on IntegriCloud