From owner-cvs-all@FreeBSD.ORG Wed Jul 30 14:04:53 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 281DF37B436; Wed, 30 Jul 2003 14:04:50 -0700 (PDT) Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id D8F6E43F93; Wed, 30 Jul 2003 14:04:46 -0700 (PDT) (envelope-from ru@sunbay.com) Received: from whale.sunbay.crimea.ua (ru@localhost [127.0.0.1]) h6UL4h0U034559 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 31 Jul 2003 00:04:43 +0300 (EEST) (envelope-from ru@sunbay.com) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.12.9/8.12.8/Submit) id h6UL4hv4034554; Thu, 31 Jul 2003 00:04:43 +0300 (EEST) (envelope-from ru) Date: Thu, 31 Jul 2003 00:04:43 +0300 From: Ruslan Ermilov To: John Baldwin Message-ID: <20030730210443.GD33188@sunbay.com> References: <20030725130041.GA84040@sunbay.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="JwB53PgKC5A7+0Ej" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.4i 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 21:04:53 -0000 --JwB53PgKC5A7+0Ej Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jul 30, 2003 at 04:48:28PM -0400, John Baldwin wrote: >=20 > 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: > >>=20 > >> > ru 2003/07/25 01:54:41 PDT > >> >=20 > >> > FreeBSD src repository > >> >=20 > >> > Modified files: > >> > release Makefile=20 > >> > share/man/man7 release.7=20 > >> > Log: > >> > Moved the boot floppy generation code out from release.9 to releas= e.10. > >>=20 > >> - 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= =2Egz \ > >> + ${BOOTINODE} ${SMALLBOOTLABEL} > >>=20 > >> 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. > >>=20 > >> > load -t mfs_root /mfsroot > >>=20 > > Would the following work for you? > >=20 > > %%% > > Index: Makefile > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > > 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} =3D=3D "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} !=3D "ia64" > > @echo "set hint.acpi.0.disabled=3D1" >> ${RD}/image.${FSIMAGE}/bo= ot/loader.rc > > .endif > > %%% > >=20 > > Or do you insist that it's always named /mfsroot? >=20 > 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. >=20 The copying is only done for image.BIG. Cheers, --=20 Ruslan Ermilov Sysadmin and DBA, ru@sunbay.com Sunbay Software Ltd, ru@FreeBSD.org FreeBSD committer --JwB53PgKC5A7+0Ej Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE/KDLrUkv4P6juNwoRAs3JAJ94ssdQJGcWonFX+mmsrye4WfPDJwCfSq3N ODzzatU1348B1mxRYdCGbvg= =SWBG -----END PGP SIGNATURE----- --JwB53PgKC5A7+0Ej--