From owner-p4-releng Fri Mar 29 21:59:25 2002 Delivered-To: p4-releng@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D40737B419; Fri, 29 Mar 2002 21:59:21 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mail11.speakeasy.net (mail11.speakeasy.net [216.254.0.211]) by hub.freebsd.org (Postfix) with ESMTP id 08DB337B417 for ; Fri, 29 Mar 2002 21:59:19 -0800 (PST) Received: (qmail 30423 invoked from network); 30 Mar 2002 05:59:17 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail11.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 30 Mar 2002 05:59:17 -0000 Received: from laptop.baldwin.cx (john@laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g2U606v03176; Sat, 30 Mar 2002 01:00:06 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200203300549.g2U5n3533276@freefall.freebsd.org> Date: Sat, 30 Mar 2002 00:59:25 -0500 (EST) From: John Baldwin To: Murray Stokely Subject: RE: PERFORCE change 8656 for review Cc: Perforce Change Reviews Sender: owner-p4-releng@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 30-Mar-2002 Murray Stokely wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8656 > > Change 8656 by murray@murray_builder on 2002/03/29 21:48:32 > > Integrate from CVS - bump the Alpha MFSSIZE, and don't include > pccard.conf. > > Affected files ... > > ... //depot/releng/5_dp1/src/release/Makefile#3 integrate > > Differences ... > > ==== //depot/releng/5_dp1/src/release/Makefile#3 (text+ko) ==== > > @@ -635,6 +637,9 @@ > -test -f ${.CURDIR}/install.cfg && cp ${.CURDIR}/install.cfg ${RD}/mfsfd > @mkdir -p ${RD}/mfsfd/boot > @cp /boot/boot* ${RD}/mfsfd/boot > +.if ${MACHINE} == "i386" > + @cp /boot/mbr ${RD}/mfsfd/boot > +.endif > @cp /boot/loader.help ${RD}/mfsfd/boot > @cd ${.CURDIR} && ${MAKE} createBOOTMFS > .if exists(${.CURDIR}/${MACHINE}/drivers.conf) This part is extra and was part of Ruslan's cleanup of sysinstall to not compile boot managers into the binary. It's harmless but the log message didn't document it. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-releng" in the body of the message