Date: Thu, 31 Jul 2003 00:04:43 +0300 From: Ruslan Ermilov <ru@FreeBSD.org> To: John Baldwin <jhb@FreeBSD.org> Cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/release Makefile src/share/man/man7 release.7 Message-ID: <20030730210443.GD33188@sunbay.com> In-Reply-To: <XFMail.20030730164828.jhb@FreeBSD.org> References: <20030725130041.GA84040@sunbay.com> <XFMail.20030730164828.jhb@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Wed, Jul 30, 2003 at 04:48:28PM -0400, John Baldwin wrote:
>
> 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 <ru@FreeBSD.org> 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.
>
The copying is only done for image.BIG.
Cheers,
--
Ruslan Ermilov Sysadmin and DBA,
ru@sunbay.com Sunbay Software Ltd,
ru@FreeBSD.org FreeBSD committer
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (FreeBSD)
iD8DBQE/KDLrUkv4P6juNwoRAs3JAJ94ssdQJGcWonFX+mmsrye4WfPDJwCfSq3N
ODzzatU1348B1mxRYdCGbvg=
=SWBG
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030730210443.GD33188>