From owner-p4-projects@FreeBSD.ORG  Mon Jul 11 04:59:56 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 67F0D16A420; Mon, 11 Jul 2005 04:59:56 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4233316A41C
	for <perforce@freebsd.org>; Mon, 11 Jul 2005 04:59:56 +0000 (GMT)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 136B243D46
	for <perforce@freebsd.org>; Mon, 11 Jul 2005 04:59:56 +0000 (GMT)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6B4xteZ070544
	for <perforce@freebsd.org>; Mon, 11 Jul 2005 04:59:55 GMT
	(envelope-from soc-andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6B4xtYe070541
	for perforce@freebsd.org; Mon, 11 Jul 2005 04:59:55 GMT
	(envelope-from soc-andrew@freebsd.org)
Date: Mon, 11 Jul 2005 04:59:55 GMT
Message-Id: <200507110459.j6B4xtYe070541@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-andrew@freebsd.org using -f
From: soc-andrew <soc-andrew@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 79961 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Jul 2005 04:59:57 -0000

http://perforce.freebsd.org/chv.cgi?CH=79961

Change 79961 by soc-andrew@soc-andrew_serv on 2005/07/11 04:59:10

	Catchup with vendor

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#8 integrate

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#8 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.886 2005/06/16 18:16:13 ru Exp $
+# $FreeBSD: src/release/Makefile,v 1.887 2005/07/11 03:59:25 scottl Exp $
 #
 # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
 #     [RELEASETAG=tag]
@@ -699,7 +699,8 @@
 	rm -rf ${RD}/mfsfd
 	mkdir ${RD}/mfsfd
 	cd ${RD}/mfsfd && \
-		mkdir -p etc/defaults dev mnt stand/etc/defaults stand/help
+		mkdir -p etc/defaults dev mnt stand/etc/defaults stand/help \
+		var/empty
 	@cd ${.CURDIR} && $(MAKE) installCRUNCH CRUNCH=boot \
 		DIR=${RD}/mfsfd/stand ZIP=false
 	( cd ${RD}/mfsfd && \
@@ -712,6 +713,8 @@
 	    ${RD}/mfsfd/etc/defaults/pccard.conf
 .endif
 	cp ${.CURDIR}/../etc/usbd.conf ${RD}/mfsfd/etc/usbd.conf
+	cp ${.CURDIR}/../etc/master.passwd ${RD}/mfsfd/etc/master.passwd
+	pwd_mkdb -d ${RD}/mfsfd/etc -p ${RD}/mfsfd/etc/master.passwd
 	( for F in defaults/rc.conf netconfig protocols ; do \
 		sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \
 		${RD}/trees/base/etc/$$F > ${RD}/mfsfd/stand/etc/$$F ; \