From owner-p4-projects@FreeBSD.ORG  Fri Jul  8 09:54:15 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 8E89016A420; Fri,  8 Jul 2005 09:54:14 +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 6381116A41C
	for <perforce@freebsd.org>; Fri,  8 Jul 2005 09:54:14 +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 3536443D48
	for <perforce@freebsd.org>; Fri,  8 Jul 2005 09:54:14 +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 j689sEs8044754
	for <perforce@freebsd.org>; Fri, 8 Jul 2005 09:54:14 GMT
	(envelope-from soc-andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j689sD3m044750
	for perforce@freebsd.org; Fri, 8 Jul 2005 09:54:13 GMT
	(envelope-from soc-andrew@freebsd.org)
Date: Fri, 8 Jul 2005 09:54:13 GMT
Message-Id: <200507080954.j689sD3m044750@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 79745 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: Fri, 08 Jul 2005 09:54:15 -0000

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

Change 79745 by soc-andrew@soc-andrew_serv on 2005/07/08 09:53:14

	Remove 2 lines that slipped in with the last submit.
	This fixes make (re)release and removes a duplicate line

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#4 edit

Differences ...

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

@@ -939,11 +939,9 @@
 .else
 	@cp ${RD}/mfsroot/mfsroot.gz ${CD_LIVEFS}/boot/mfsroot.gz
 .endif
-	@cp ${RD}/mfsroot/mfsroot.gz ${CD_LIVEFS}/boot/mfsroot.gz
 	@echo 'mfsroot_load="YES"' > ${CD_LIVEFS}/boot/loader.conf
 	@echo 'mfsroot_type="mfs_root"' >> ${CD_LIVEFS}/boot/loader.conf
 	@echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_LIVEFS}/boot/loader.conf
-.endif
 .if exists(${RD}/trees/base/boot/device.hints)
 	# Break the link to device.hints so we can modify it
 	@rm -f ${CD_LIVEFS}/boot/device.hints