svn commit: r244131 - stable/9/usr.sbin/bsdinstall/scripts

[Glen Barber]

Author: gjb (doc,ports committer)
Date: Wed Dec 12 01:05:19 2012
New Revision: 244131
URL: http://svnweb.freebsd.org/changeset/base/244131

Log:
  MFC r244057, r244059:
  
  r244057:
   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.
  
  r244059:
   Add missed BETA* to list.

Modified:
  stable/9/usr.sbin/bsdinstall/scripts/mirrorselect
Directory Properties:
  stable/9/usr.sbin/bsdinstall/   (props changed)
  stable/9/usr.sbin/bsdinstall/scripts/   (props changed)

Modified: stable/9/usr.sbin/bsdinstall/scripts/mirrorselect
==============================================================================
--- stable/9/usr.sbin/bsdinstall/scripts/mirrorselect	Wed Dec 12 00:39:54 2012	(r244130)
+++ stable/9/usr.sbin/bsdinstall/scripts/mirrorselect	Wed Dec 12 01:05:19 2012	(r244131)
@@ -192,7 +192,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|*-BETA*|*-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)