cvs commit: src/release Makefile src/share/man/man7 release.7

[Ruslan Ermilov]

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 at repoman.freebsd.org>
> >> Ruslan Ermilov <ru at 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 at sunbay.com		Sunbay Software Ltd,
ru at FreeBSD.org		FreeBSD committer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-src/attachments/20030731/b250f77c/attachment.bin