Add mirror selection for FTP installs. To support TBEMD installs

(e.g. powerpc64), this looks in a slightly different default path than now,
specifying both $MACHINE and $MACHINE_ARCH:
MIRROR/pub/FreeBSD/releases/`uname -p`/`uname -m`/`uname -r`

How to handle TBEMD properly probably merits some more discussion, but,
since no such 9.0-CURRENT distfiles exist at the moment, all existing
mirrors presently fail anyway.

3 files changed, 235 insertions, 4 deletions

diff --git a/usr.sbin/bsdinstall/scripts/Makefile b/usr.sbin/bsdinstall/scripts/Makefile
index b1a49ad..8ad6744 100644
--- a/usr.sbin/bsdinstall/scripts/Makefile
+++ b/usr.sbin/bsdinstall/scripts/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-SCRIPTS= auto adduser checksum config hostname jail keymap mount netconfig \
-	 rootpass services time umount wlanconfig
+SCRIPTS= auto adduser checksum config hostname jail keymap mirrorselect \
+	 mount netconfig rootpass services time umount wlanconfig
 BINDIR= /usr/libexec/bsdinstall
 
 NO_MAN=	true
diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto
index a857edc..8e28862 100755
--- a/usr.sbin/bsdinstall/scripts/auto
+++ b/usr.sbin/bsdinstall/scripts/auto
@@ -35,6 +35,7 @@ error() {
 	if [ $? -ne 0 ]; then
 		exit
 	else
+		test -n $DISTDIR_IS_UNIONFS && umount -f $BSDINSTALL_DISTDIR
 		test -f $PATH_FSTAB && bsdinstall umount
 		exec $0
 	fi
@@ -72,13 +73,23 @@ for dist in $DISTRIBUTIONS; do
 		FETCH_DISTRIBUTIONS="$FETCH_DISTRIBUTIONS $dist"
 	fi
 done
+FETCH_DISTRIBUTIONS=`echo $FETCH_DISTRIBUTIONS`	# Trim white space
 
-if [ ! -z "$FETCH_DISTRIBUTIONS" -a ! -z $BSDINSTALL_CONFIGCURRENT ]; then
+if [ -n "$FETCH_DISTRIBUTIONS" -a -n "$BSDINSTALL_CONFIGCURRENT" ]; then
 	dialog --backtitle "FreeBSD Installer" --title "Network Installation" --msgbox "No installation files were found on the boot volume. The next few screens will allow you to configure networking so that they can be downloaded from the Internet." 0 0
 	bsdinstall netconfig || error
 	NETCONFIG_DONE=yes
 fi
 
+if [ -n "$FETCH_DISTRIBUTIONS" -a -z "$BSDINSTALL_DISTSITE" ]; then
+	exec 3>&1
+	BSDINSTALL_DISTSITE=`bsdinstall mirrorselect 2>&1 1>&3`
+	MIRROR_BUTTON=$?
+	exec 3>&-
+	test $MIRROR_BUTTON -eq 0 || error
+	export BSDINSTALL_DISTSITE
+fi
+
 rm $PATH_FSTAB
 touch $PATH_FSTAB
 
@@ -114,7 +125,11 @@ if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then
 
 	export DISTRIBUTIONS="$FETCH_DISTRIBUTIONS"
 	# Try to use any existing distfiles
-	[ -d $BSDINSTALL_DISTDIR -a "$FETCH_DISTRIBUTIONS" != "$ALL_DISTRIBUTIONS" ] && mount_unionfs "$BSDINSTALL_FETCHDEST" "$BSDINSTALL_DISTDIR"
+	if [ -d $BSDINSTALL_DISTDIR -a "$FETCH_DISTRIBUTIONS" != \
+	    "$ALL_DISTRIBUTIONS" ]; then
+		DISTDIR_IS_UNIONFS=1
+		mount_unionfs "$BSDINSTALL_FETCHDEST" "$BSDINSTALL_DISTDIR"
+	fi
 
 	# Otherwise, fetch everything
 	if [ $? -ne 0 ]; then
@@ -126,6 +141,8 @@ if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then
 	export DISTRIBUTIONS="$ALL_DISTRIBUTIONS"
 fi
 
+error
+
 bsdinstall checksum || error
 bsdinstall distextract || error
 bsdinstall rootpass || error
diff --git a/usr.sbin/bsdinstall/scripts/mirrorselect b/usr.sbin/bsdinstall/scripts/mirrorselect
new file mode 100755
index 0000000..79a23bf
--- /dev/null
+++ b/usr.sbin/bsdinstall/scripts/mirrorselect
@@ -0,0 +1,214 @@
+#!/bin/sh
+#-
+# Copyright (c) 2011 Nathan Whitehorn
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+
+: ${DIALOG_OK=0}
+: ${DIALOG_CANCEL=1}
+: ${DIALOG_HELP=2}
+: ${DIALOG_EXTRA=3}
+: ${DIALOG_ITEM_HELP=4}
+: ${DIALOG_ESC=255}
+
+exec 3>&1
+MIRROR=`dialog --backtitle "FreeBSD Installer" \
+    --title "Mirror Selection" --extra-button --extra-label "Other" \
+    --menu "Please select the site closest to you or \"other\" if you'd like to specify a different choice.  Also note that not every site listed here carries more than the base distribution kits. Only Primary sites are guaranteed to carry the full range of possible distributions. Select a site that's close!" \
+    0 0 0 \
+	ftp://ftp.freebsd.org	"Main Site"\
+	ftp://snapshots.jp.freebsd.org 	"Snapshots Server Japan"\
+	ftp://snapshots.se.freebsd.org 	"Snapshots Server Sweden"\
+	ftp://ftp.freebsd.org 	"IPv6 Main Site"\
+	ftp://ftp3.ie.freebsd.org 	"IPv6 Ireland"\
+	ftp://ftp.il.freebsd.org 	"IPv6 Israel"\
+	ftp://ftp2.jp.freebsd.org 	"IPv6 Japan"\
+	ftp://ftp4.us.freebsd.org 	"IPv6 USA"\
+	ftp://ftp2.tr.freebsd.org 	"IPv6 Turkey"\
+	ftp://ftp1.freebsd.org 	"Primary"\
+	ftp://ftp2.freebsd.org 	"Primary #2"\
+	ftp://ftp3.freebsd.org 	"Primary #3"\
+	ftp://ftp4.freebsd.org 	"Primary #4"\
+	ftp://ftp5.freebsd.org 	"Primary #5"\
+	ftp://ftp6.freebsd.org 	"Primary #6"\
+	ftp://ftp7.freebsd.org 	"Primary #7"\
+	ftp://ftp8.freebsd.org 	"Primary #8"\
+	ftp://ftp9.freebsd.org 	"Primary #9"\
+	ftp://ftp10.freebsd.org 	"Primary #10"\
+	ftp://ftp11.freebsd.org 	"Primary #11"\
+	ftp://ftp12.freebsd.org 	"Primary #12"\
+	ftp://ftp13.freebsd.org 	"Primary #13"\
+	ftp://ftp14.freebsd.org 	"Primary #14"\
+	ftp://ftp.ar.freebsd.org 	"Argentina"\
+	ftp://ftp.au.freebsd.org 	"Australia"\
+	ftp://ftp2.au.freebsd.org 	"Australia #2"\
+	ftp://ftp3.au.freebsd.org 	"Australia #3"\
+	ftp://ftp.at.freebsd.org 	"Austria"\
+	ftp://ftp2.at.freebsd.org 	"Austria #2"\
+	ftp://ftp.br.freebsd.org 	"Brazil"\
+	ftp://ftp2.br.freebsd.org 	"Brazil #2"\
+	ftp://ftp3.br.freebsd.org 	"Brazil #3"\
+	ftp://ftp4.br.freebsd.org 	"Brazil #4"\
+	ftp://ftp5.br.freebsd.org 	"Brazil #5"\
+	ftp://ftp6.br.freebsd.org 	"Brazil #6"\
+	ftp://ftp7.br.freebsd.org 	"Brazil #7"\
+	ftp://ftp.ca.freebsd.org 	"Canada"\
+	ftp://ftp.cn.freebsd.org 	"China"\
+	ftp://ftp2.cn.freebsd.org 	"China #2"\
+	ftp://ftp.hr.freebsd.org 	"Croatia"\
+	ftp://ftp.cz.freebsd.org 	"Czech Republic"\
+	ftp://ftp.dk.freebsd.org 	"Denmark"\
+	ftp://ftp2.dk.freebsd.org 	"Denmark #2"\
+	ftp://ftp.ee.freebsd.org 	"Estonia"\
+	ftp://ftp.fi.freebsd.org 	"Finland"\
+	ftp://ftp.fr.freebsd.org 	"France"\
+	ftp://ftp2.fr.freebsd.org 	"France #2"\
+	ftp://ftp3.fr.freebsd.org 	"France #3"\
+	ftp://ftp5.fr.freebsd.org 	"France #5"\
+	ftp://ftp6.fr.freebsd.org 	"France #6"\
+	ftp://ftp8.fr.freebsd.org 	"France #8"\
+	ftp://ftp.de.freebsd.org 	"Germany"\
+	ftp://ftp2.de.freebsd.org 	"Germany #2"\
+	ftp://ftp3.de.freebsd.org 	"Germany #3"\
+	ftp://ftp4.de.freebsd.org 	"Germany #4"\
+	ftp://ftp5.de.freebsd.org 	"Germany #5"\
+	ftp://ftp6.de.freebsd.org 	"Germany #6"\
+	ftp://ftp7.de.freebsd.org 	"Germany #7"\
+	ftp://ftp8.de.freebsd.org 	"Germany #8"\
+	ftp://ftp.gr.freebsd.org 	"Greece"\
+	ftp://ftp2.gr.freebsd.org 	"Greece #2"\
+	ftp://ftp.hu.freebsd.org 	"Hungary"\
+	ftp://ftp.is.freebsd.org 	"Iceland"\
+	ftp://ftp.ie.freebsd.org 	"Ireland"\
+	ftp://ftp2.ie.freebsd.org 	"Ireland #2"\
+	ftp://ftp3.ie.freebsd.org 	"Ireland #3"\
+	ftp://ftp.il.freebsd.org 	"Israel"\
+	ftp://ftp.it.freebsd.org 	"Italy"\
+	ftp://ftp.jp.freebsd.org 	"Japan"\
+	ftp://ftp2.jp.freebsd.org 	"Japan #2"\
+	ftp://ftp3.jp.freebsd.org 	"Japan #3"\
+	ftp://ftp4.jp.freebsd.org 	"Japan #4"\
+	ftp://ftp5.jp.freebsd.org 	"Japan #5"\
+	ftp://ftp6.jp.freebsd.org 	"Japan #6"\
+	ftp://ftp7.jp.freebsd.org 	"Japan #7"\
+	ftp://ftp8.jp.freebsd.org 	"Japan #8"\
+	ftp://ftp9.jp.freebsd.org 	"Japan #9"\
+	ftp://ftp.kr.freebsd.org 	"Korea"\
+	ftp://ftp2.kr.freebsd.org 	"Korea #2"\
+	ftp://ftp.lt.freebsd.org 	"Lithuania"\
+	ftp://ftp.nl.freebsd.org 	"Netherlands"\
+	ftp://ftp2.nl.freebsd.org 	"Netherlands #2"\
+	ftp://ftp.no.freebsd.org 	"Norway"\
+	ftp://ftp3.no.freebsd.org 	"Norway #3"\
+	ftp://ftp.pl.freebsd.org 	"Poland"\
+	ftp://ftp2.pl.freebsd.org 	"Poland #2"\
+	ftp://ftp5.pl.freebsd.org 	"Poland #5"\
+	ftp://ftp.pt.freebsd.org 	"Portugal"\
+	ftp://ftp2.pt.freebsd.org 	"Portugal #2"\
+	ftp://ftp4.pt.freebsd.org 	"Portugal #4"\
+	ftp://ftp.ro.freebsd.org 	"Romania"\
+	ftp://ftp.ru.freebsd.org 	"Russia"\
+	ftp://ftp2.ru.freebsd.org 	"Russia #2"\
+	ftp://ftp3.ru.freebsd.org 	"Russia #3"\
+	ftp://ftp4.ru.freebsd.org 	"Russia #4"\
+	ftp://ftp.sg.freebsd.org 	"Singapore"\
+	ftp://ftp.sk.freebsd.org 	"Slovak Republic"\
+	ftp://ftp.si.freebsd.org 	"Slovenia"\
+	ftp://ftp2.si.freebsd.org 	"Slovenia #2"\
+	ftp://ftp.za.freebsd.org 	"South Africa"\
+	ftp://ftp2.za.freebsd.org 	"South Africa #2"\
+	ftp://ftp3.za.freebsd.org 	"South Africa #3"\
+	ftp://ftp4.za.freebsd.org 	"South Africa #4"\
+	ftp://ftp.es.freebsd.org 	"Spain"\
+	ftp://ftp2.es.freebsd.org 	"Spain #2"\
+	ftp://ftp3.es.freebsd.org 	"Spain #3"\
+	ftp://ftp.se.freebsd.org 	"Sweden"\
+	ftp://ftp2.se.freebsd.org 	"Sweden #2"\
+	ftp://ftp3.se.freebsd.org 	"Sweden #3"\
+	ftp://ftp4.se.freebsd.org 	"Sweden #4"\
+	ftp://ftp5.se.freebsd.org 	"Sweden #5"\
+	ftp://ftp.ch.freebsd.org 	"Switzerland"\
+	ftp://ftp2.ch.freebsd.org 	"Switzerland #2"\
+	ftp://ftp.tw.freebsd.org 	"Taiwan"\
+	ftp://ftp2.tw.freebsd.org 	"Taiwan #2"\
+	ftp://ftp3.tw.freebsd.org 	"Taiwan #3"\
+	ftp://ftp4.tw.freebsd.org 	"Taiwan #4"\
+	ftp://ftp6.tw.freebsd.org 	"Taiwan #6"\
+	ftp://ftp11.tw.freebsd.org 	"Taiwan #11"\
+	ftp://ftp.tr.freebsd.org 	"Turkey"\
+	ftp://ftp2.tr.freebsd.org 	"Turkey #2"\
+	ftp://ftp.uk.freebsd.org 	"UK"\
+	ftp://ftp2.uk.freebsd.org 	"UK #2"\
+	ftp://ftp3.uk.freebsd.org 	"UK #3"\
+	ftp://ftp4.uk.freebsd.org 	"UK #4"\
+	ftp://ftp5.uk.freebsd.org 	"UK #5"\
+	ftp://ftp6.uk.freebsd.org 	"UK #6"\
+	ftp://ftp.ua.freebsd.org 	"Ukraine"\
+	ftp://ftp2.ua.freebsd.org 	"Ukraine #2"\
+	ftp://ftp5.ua.freebsd.org 	"Ukraine #5"\
+	ftp://ftp6.ua.freebsd.org 	"Ukraine #6"\
+	ftp://ftp7.ua.freebsd.org 	"Ukraine #7"\
+	ftp://ftp8.ua.freebsd.org 	"Ukraine #8"\
+	ftp://ftp1.us.freebsd.org 	"USA #1"\
+	ftp://ftp2.us.freebsd.org 	"USA #2"\
+	ftp://ftp3.us.freebsd.org 	"USA #3"\
+	ftp://ftp4.us.freebsd.org 	"USA #4"\
+	ftp://ftp5.us.freebsd.org 	"USA #5"\
+	ftp://ftp6.us.freebsd.org 	"USA #6"\
+	ftp://ftp7.us.freebsd.org 	"USA #7"\
+	ftp://ftp8.us.freebsd.org 	"USA #8"\
+	ftp://ftp9.us.freebsd.org 	"USA #9"\
+	ftp://ftp10.us.freebsd.org 	"USA #10"\
+	ftp://ftp11.us.freebsd.org 	"USA #11"\
+	ftp://ftp12.us.freebsd.org 	"USA #12"\
+	ftp://ftp13.us.freebsd.org 	"USA #13"\
+	ftp://ftp14.us.freebsd.org 	"USA #14"\
+	ftp://ftp15.us.freebsd.org 	"USA #15"\
+    2>&1 1>&3`
+MIRROR_BUTTON=$?
+exec 3>&-
+
+BSDINSTALL_DISTSITE="$MIRROR/pub/FreeBSD/releases/`uname -p`/`uname -m`/`uname -r`"
+
+case $MIRROR_BUTTON in
+$DIALOG_CANCEL)
+	exit 1
+	;;
+$DIALOG_OK)
+	;;
+$DIALOG_EXTRA)
+	exec 3>&1
+	BSDINSTALL_DISTSITE=`dialog --backtitle "FreeBSD Installer" \
+	    --title "Mirror Selection" \
+	    --inputbox "Please enter the URL to an alternate FreeBSD mirror:" \
+	    0 0 "$BSDINSTALL_DISTSITE" 2>&1 1>&3`
+	MIRROR_BUTTON=$?
+	exec 3>&-
+	test $MIRROR_BUTTON -eq 0 || exec $0 $@
+	;;
+esac
+
+export BSDINSTALL_DISTSITE
+echo $BSDINSTALL_DISTSITE >&2