From owner-svn-src-all@FreeBSD.ORG  Sun Dec  9 22:53:54 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 983E2673;
 Sun,  9 Dec 2012 22:53:54 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7CB408FC0C;
 Sun,  9 Dec 2012 22:53:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB9MrsH5052478;
 Sun, 9 Dec 2012 22:53:54 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB9Mrsce052477;
 Sun, 9 Dec 2012 22:53:54 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212092253.qB9Mrsce052477@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 9 Dec 2012 22:53:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244057 - head/usr.sbin/bsdinstall/scripts
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Dec 2012 22:53:54 -0000

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)