From owner-svn-src-user@FreeBSD.ORG  Fri Feb 18 14:34:33 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B6D4F106564A;
	Fri, 18 Feb 2011 14:34:33 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A2E108FC0A;
	Fri, 18 Feb 2011 14:34:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1IEYXVB060954;
	Fri, 18 Feb 2011 14:34:33 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1IEYXCo060951;
	Fri, 18 Feb 2011 14:34:33 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201102181434.p1IEYXCo060951@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Fri, 18 Feb 2011 14:34:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218798 - in user/nwhitehorn/bsdinstall: . release
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Feb 2011 14:34:33 -0000

Author: nwhitehorn
Date: Fri Feb 18 14:34:33 2011
New Revision: 218798
URL: http://svn.freebsd.org/changeset/base/218798

Log:
  Rename bsdinstall-dist to freebsd-dist so it's clearer what it is.

Modified:
  user/nwhitehorn/bsdinstall/bsdinstall
  user/nwhitehorn/bsdinstall/release/testsystem.sh

Modified: user/nwhitehorn/bsdinstall/bsdinstall
==============================================================================
--- user/nwhitehorn/bsdinstall/bsdinstall	Fri Feb 18 13:41:45 2011	(r218797)
+++ user/nwhitehorn/bsdinstall/bsdinstall	Fri Feb 18 14:34:33 2011	(r218798)
@@ -4,7 +4,7 @@
 : ${BSDINSTALL_LOG="/tmp/bsdinstall_log"}; export BSDINSTALL_LOG
 : ${BSDINSTALL_TMPETC="/tmp/bsdinstall_etc"}; export BSDINSTALL_TMPETC
 : ${PATH_FSTAB="$BSDINSTALL_TMPETC/fstab"}; export PATH_FSTAB
-: ${BSDINSTALL_DISTDIR="/usr/bsdinstall-dist"}; export BSDINSTALL_DISTDIR
+: ${BSDINSTALL_DISTDIR="/usr/freebsd-dist"}; export BSDINSTALL_DISTDIR
 : ${BSDINSTALL_CHROOT="/mnt"}; export BSDINSTALL_CHROOT
 
 VERB=$1; shift

Modified: user/nwhitehorn/bsdinstall/release/testsystem.sh
==============================================================================
--- user/nwhitehorn/bsdinstall/release/testsystem.sh	Fri Feb 18 13:41:45 2011	(r218797)
+++ user/nwhitehorn/bsdinstall/release/testsystem.sh	Fri Feb 18 14:34:33 2011	(r218798)
@@ -33,8 +33,8 @@ tar cvzf $2/world.tgz .
 cd /usr/src
 make installkernel DESTDIR=$1
 rm $1/boot/kernel/*.symbols # Kernel symbols bloat the live CD
-mkdir $1/usr/bsdinstall-dist
-cp $2/kernel.tgz $2/world.tgz $1/usr/bsdinstall-dist
+mkdir $1/usr/freebsd-dist
+cp $2/kernel.tgz $2/world.tgz $1/usr/freebsd-dist
 
 # Things for the CD environment
 ln -s /tmp/bsdinstall_etc/resolv.conf $1/etc/resolv.conf