From owner-cvs-all@FreeBSD.ORG Wed Jul 30 13:48:18 2003 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C563037B405 for ; Wed, 30 Jul 2003 13:48:18 -0700 (PDT) Received: from mail.speakeasy.net (mail13.speakeasy.net [216.254.0.213]) by mx1.FreeBSD.org (Postfix) with ESMTP id 209F543F93 for ; Wed, 30 Jul 2003 13:48:16 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 8751 invoked from network); 30 Jul 2003 20:48:14 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender )encrypted SMTP for ; 30 Jul 2003 20:48:14 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.9/8.12.9) with ESMTP id h6UKm7GI068840; Wed, 30 Jul 2003 16:48:10 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.4 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20030725130041.GA84040@sunbay.com> Date: Wed, 30 Jul 2003 16:48:28 -0400 (EDT) From: John Baldwin To: Ruslan Ermilov cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: Takahashi Yoshihiro cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/release Makefile src/share/man/man7 release.7 X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jul 2003 20:48:19 -0000 On 25-Jul-2003 Ruslan Ermilov wrote: > On Fri, Jul 25, 2003 at 09:31:23PM +0900, Takahashi Yoshihiro wrote: >> In article <200307250854.h6P8sfom098536@repoman.freebsd.org> >> Ruslan Ermilov writes: >> >> > ru 2003/07/25 01:54:41 PDT >> > >> > FreeBSD src repository >> > >> > Modified files: >> > release Makefile >> > share/man/man7 release.7 >> > Log: >> > Moved the boot floppy generation code out from release.9 to release.10. >> >> - sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \ >> + sh -e ${DOFS_SH} mfsroot-small ${RD} ${MNT} \ >> (snip) >> + @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot-small.flp \ >> + ${RD} ${MNT} ${SMALLBOOTSIZE} ${RD}/mfsroot/mfsroot-small.gz \ >> + ${BOOTINODE} ${SMALLBOOTLABEL} >> >> This change breaks small floppy image support. The filename of MFS >> filesystem should be 'mfsroot', not 'mfsroot-small'. Because we use >> the following command to load MFS filesystem. >> >> > load -t mfs_root /mfsroot >> > Would the following work for you? > > %%% > Index: Makefile > =================================================================== > RCS file: /home/ncvs/src/release/Makefile,v > retrieving revision 1.798 > diff -u -r1.798 Makefile > --- Makefile 25 Jul 2003 08:55:51 -0000 1.798 > +++ Makefile 25 Jul 2003 12:58:42 -0000 > @@ -1087,7 +1087,11 @@ > @echo "echo Please insert MFS root floppy and press enter:" >> > ${RD}/image.${FSIMAGE}/boot/loader.rc > @echo "read" >> ${RD}/image.${FSIMAGE}/boot/loader.rc > .endif > +.if defined(FDSIZE) && ${FDSIZE} == "SMALL" > + @echo "load -t mfs_root /mfsroot-small" >> ${RD}/image.${FSIMAGE}/boot/loader.rc > +.else > @echo "load -t mfs_root /mfsroot" >> ${RD}/image.${FSIMAGE}/boot/loader.rc > +.endif > .if ${TARGET_ARCH} != "ia64" > @echo "set hint.acpi.0.disabled=1" >> ${RD}/image.${FSIMAGE}/boot/loader.rc > .endif > %%% > > Or do you insist that it's always named /mfsroot? I think you should probably copy the appropriate mfsroot to the right location instead. I.e. when you copy mfsroot-small to image.SMALL, name it as mfsroot instead. That would be cleaner IMO. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/