From owner-cvs-all@FreeBSD.ORG Fri Jul 25 06:01:03 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 016FD37B401; Fri, 25 Jul 2003 06:01:03 -0700 (PDT) Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id A017D43F85; Fri, 25 Jul 2003 06:00:48 -0700 (PDT) (envelope-from ru@sunbay.com) Received: from whale.sunbay.crimea.ua (ru@localhost [127.0.0.1]) h6PD0f0U085761 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 25 Jul 2003 16:00:42 +0300 (EEST) (envelope-from ru@sunbay.com) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.12.9/8.12.8/Submit) id h6PD0fCr085756; Fri, 25 Jul 2003 16:00:41 +0300 (EEST) (envelope-from ru) Date: Fri, 25 Jul 2003 16:00:41 +0300 From: Ruslan Ermilov To: Takahashi Yoshihiro Message-ID: <20030725130041.GA84040@sunbay.com> References: <200307250854.h6P8sfom098536@repoman.freebsd.org> <20030725.213123.74673434.nyan@jp.FreeBSD.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="fdj2RfSjLxBAspz7" Content-Disposition: inline In-Reply-To: <20030725.213123.74673434.nyan@jp.FreeBSD.org> User-Agent: Mutt/1.5.4i cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org 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: Fri, 25 Jul 2003 13:01:03 -0000 --fdj2RfSjLxBAspz7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 release.1= 0. >=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.gz \ > + ${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? %%% 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}/imag= e.${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/lo= ader.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}/boot/loade= r.rc .endif %%% Or do you insist that it's always named /mfsroot? Cheers, --=20 Ruslan Ermilov Sysadmin and DBA, ru@sunbay.com Sunbay Software Ltd, ru@FreeBSD.org FreeBSD committer --fdj2RfSjLxBAspz7 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE/ISn5Ukv4P6juNwoRAl5YAJ9jtkxyZpVfgvIjYOG7fJVogIRbVACfajra OWbBD9W0MAzP4AStqE/bIAY= =vuY1 -----END PGP SIGNATURE----- --fdj2RfSjLxBAspz7--