From owner-cvs-src@FreeBSD.ORG  Fri Jul 25 09:29:54 2003
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id EC66B37B401; Fri, 25 Jul 2003 09:29:53 -0700 (PDT)
Received: from dragon.nuxi.com (trang.nuxi.com [66.93.134.19])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 310B043F85; Fri, 25 Jul 2003 09:29:53 -0700 (PDT)
	(envelope-from obrien@NUXI.com)
Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1])
	by dragon.nuxi.com (8.12.9/8.12.9) with ESMTP id h6PGTqju037696;
	Fri, 25 Jul 2003 09:29:52 -0700 (PDT)
	(envelope-from obrien@dragon.nuxi.com)
Received: (from obrien@localhost)
	by dragon.nuxi.com (8.12.9/8.12.9/Submit) id h6PGTqQx037695;
	Fri, 25 Jul 2003 09:29:52 -0700 (PDT)
Date: Fri, 25 Jul 2003 09:29:52 -0700
From: "David O'Brien" <obrien@FreeBSD.org>
To: Ruslan Ermilov <ru@FreeBSD.org>
Message-ID: <20030725162952.GC37608@dragon.nuxi.com>
References: <200307250854.h6P8sfom098536@repoman.freebsd.org>
	<20030725.213123.74673434.nyan@jp.FreeBSD.org>
	<20030725130041.GA84040@sunbay.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20030725130041.GA84040@sunbay.com>
User-Agent: Mutt/1.4.1i
X-Operating-System: FreeBSD 5.1-CURRENT
Organization: The NUXI BSD Group
X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3  90 76 5D 69 58 D9 98 7A
X-Pgp-Rsa-Keyid: 1024/34F9F9D5
cc: cvs-src@FreeBSD.org
cc: src-committers@FreeBSD.org
cc: Takahashi Yoshihiro <nyan@jp.FreeBSD.org>
cc: cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/release Makefile src/share/man/man7 release.7
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: obrien@FreeBSD.org
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Jul 2003 16:29:54 -0000

On Fri, Jul 25, 2003 at 04:00:41PM +0300, Ruslan Ermilov wrote:
> 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

Can we *PLEASE* stop this .ifdef maze?  Why not set ${MFSROOT_NAME} much
higher up and have a single
    @echo "load -t mfs_root ${MFSROOT_NAME}" >> ${RD}/image.${FSIMAGE}/boot/loader.rc