From owner-svn-src-user@FreeBSD.ORG  Fri Jan 14 14:35:23 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 69386106566B;
	Fri, 14 Jan 2011 14:35:23 +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 58E578FC22;
	Fri, 14 Jan 2011 14:35:23 +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 p0EEZNaZ091038;
	Fri, 14 Jan 2011 14:35:23 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0EEZN83091036;
	Fri, 14 Jan 2011 14:35:23 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201101141435.p0EEZN83091036@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Fri, 14 Jan 2011 14:35:23 +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: r217405 - 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, 14 Jan 2011 14:35:23 -0000

Author: nwhitehorn
Date: Fri Jan 14 14:35:23 2011
New Revision: 217405
URL: http://svn.freebsd.org/changeset/base/217405

Log:
  Update to new install disk layout.

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

Modified: user/nwhitehorn/bsdinstall/release/testsystem.sh
==============================================================================
--- user/nwhitehorn/bsdinstall/release/testsystem.sh	Fri Jan 14 14:29:42 2011	(r217404)
+++ user/nwhitehorn/bsdinstall/release/testsystem.sh	Fri Jan 14 14:35:23 2011	(r217405)
@@ -33,12 +33,13 @@ tar cvzf $2/world.tgz .
 # Make system
 cd /usr/src
 make installkernel distribution DESTDIR=$1
-mkdir $1/var/dist
-cp $2/kernel.tgz $2/world.tgz $2/distribution.tgz $1/var/dist
+mkdir $1/usr/bsdinstall-dist
+cp $2/kernel.tgz $2/world.tgz $2/distribution.tgz $1/usr/bsdinstall-dist
 
 # Things for the CD environment
 ln -s /tmp/bsdinstall_etc/resolv.conf $1/etc/resolv.conf
 echo kernel_options=\"-C\" > $1/boot/loader.conf
 echo sendmail_enable=\"NONE\" > $1/etc/rc.conf
+cp rc.local $1/etc
 
 #mkisoimages.sh -b FreeBSD_Install $3 $1