Get 'uname -r' earlier, so it can be used to determine what branch is

being run to set BSDINSTALL_DISTSITE accordingly.  This change allows
non-RELEASE branches to use the FTP snapshots directory for bootonly.iso
installations.

Approved by:	simon
This commit is contained in:
gjb 2012-12-09 22:53:53 +00:00
parent 1c6e1dc79b
commit 972c593040

View File

@ -191,7 +191,18 @@ MIRROR=`dialog --backtitle "FreeBSD Installer" \
MIRROR_BUTTON=$?
exec 3>&-
BSDINSTALL_DISTSITE="$MIRROR/pub/FreeBSD/releases/`uname -m`/`uname -p`/`uname -r`"
_UNAME_R=`uname -r`
case ${_UNAME_R} in
*-CURRENT|*-STABLE|*-PRERELEASE|*-RC*)
RELDIR="snapshots"
;;
*)
RELDIR="releases"
;;
esac
BSDINSTALL_DISTSITE="$MIRROR/pub/FreeBSD/${RELDIR}/`uname -m`/`uname -p`/${_UNAME_R}"
case $MIRROR_BUTTON in
$DIALOG_CANCEL)