svn commit: r244057 - head/usr.sbin/bsdinstall/scripts

[Glen Barber]

Author: gjb (doc,ports committer)
Date: Sun Dec  9 22:53:53 2012
New Revision: 244057
URL: http://svnweb.freebsd.org/changeset/base/244057

Log:
  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

Modified:
  head/usr.sbin/bsdinstall/scripts/mirrorselect

Modified: head/usr.sbin/bsdinstall/scripts/mirrorselect
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/mirrorselect	Sun Dec  9 22:23:50 2012	(r244056)
+++ head/usr.sbin/bsdinstall/scripts/mirrorselect	Sun Dec  9 22:53:53 2012	(r244057)
@@ -191,7 +191,18 @@ MIRROR=`dialog --backtitle "FreeBSD Inst
 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)