From owner-cvs-src@FreeBSD.ORG Mon Mar 21 18:36:38 2005 Return-Path: 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 AE3CC16A4DC for ; Mon, 21 Mar 2005 18:36:38 +0000 (GMT) Received: from mail25.sea5.speakeasy.net (mail25.sea5.speakeasy.net [69.17.117.27]) by mx1.FreeBSD.org (Postfix) with ESMTP id 47F8843D48 for ; Mon, 21 Mar 2005 18:36:37 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: (qmail 6129 invoked from network); 21 Mar 2005 18:36:37 -0000 Received: from server.baldwin.cx ([216.27.160.63]) (envelope-sender )AES256-SHA encrypted SMTP for ; 21 Mar 2005 18:36:36 -0000 Received: from [10.50.41.231] (gw1.twc.weather.com [216.133.140.1]) (authenticated bits=0) by server.baldwin.cx (8.13.1/8.13.1) with ESMTP id j2LIaPDR047594; Mon, 21 Mar 2005 13:36:31 -0500 (EST) (envelope-from jhb@FreeBSD.org) From: John Baldwin To: Murray Stokely Date: Mon, 21 Mar 2005 13:37:50 -0500 User-Agent: KMail/1.6.2 References: <200503180105.j2I15kCb041514@repoman.freebsd.org> <200503210803.28912.jhb@FreeBSD.org> <20050321151202.GA8475@freebsdmall.com> In-Reply-To: <20050321151202.GA8475@freebsdmall.com> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200503211337.50380.jhb@FreeBSD.org> X-Spam-Status: No, score=-102.8 required=4.2 tests=ALL_TRUSTED, USER_IN_WHITELIST autolearn=failed version=3.0.2 X-Spam-Checker-Version: SpamAssassin 3.0.2 (2004-11-16) on server.baldwin.cx cc: cvs-src@FreeBSD.org cc: Murray Stokely cc: cvs-all@FreeBSD.org cc: src-committers@FreeBSD.org Subject: Re: cvs commit: src/usr.sbin/sysinstall sysinstall.8 X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Mar 2005 18:36:39 -0000 On Monday 21 March 2005 10:12 am, Murray Stokely wrote: > On Mon, Mar 21, 2005 at 08:03:28AM -0500, John Baldwin wrote: > > On Thursday 17 March 2005 08:05 pm, Murray Stokely wrote: > > > murray 2005-03-18 01:05:46 UTC > > > > > > FreeBSD src repository > > > > > > Modified files: > > > usr.sbin/sysinstall sysinstall.8 > > > Log: > > > Use the correct variable name for the description of multi-volume > > > support in cdrom.inf. Should be CD_VOLUME. > > > > Hmm, so do we need to include "CD_VOLUME" entries in cdrom.inf now? > > It has been an optional entry for 2 years. It should not be added to > cdrom.inf unless the INDEX file has also been modified with an > additional column to specify the volume of each package. For 5.4 and > beyond we'll want to make sure this gets added to the cdrom.inf and > that the multivolume INDEX is used. We can ensure that this happens > by better integration of your python package split script with > src/release/Makefile, and a release knob that adds this line to > cdrom.inf when a multivolume setup is built. I'm just going to always add them to disc1 and disc2. I've renamed livefs to livefs.iso, so it won't have one, but I'll make a disc2 tree in R that just has an appropriate cdrom.inf file and probably deprecate CD_EXTRA_BITS in favor of a CD_PKG_TREE that points to the output of 'make package-split' and has the disc1 and disc2 subdirs under it so the isos will join the two sets of disc1 and disc2 trees. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org