From owner-cvs-all@FreeBSD.ORG Tue Jul 22 11:26:18 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 0A4E837B404 for ; Tue, 22 Jul 2003 11:26:18 -0700 (PDT) Received: from mail.speakeasy.net (mail10.speakeasy.net [216.254.0.210]) by mx1.FreeBSD.org (Postfix) with ESMTP id 75C8643FA3 for ; Tue, 22 Jul 2003 11:26:16 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 6089 invoked from network); 22 Jul 2003 18:26:15 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender )encrypted SMTP for ; 22 Jul 2003 18:26:15 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.9/8.12.9) with ESMTP id h6MIQDGI042977; Tue, 22 Jul 2003 14:26:13 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.4 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20030722151444.GA59592@sunbay.com> Date: Tue, 22 Jul 2003 14:26:28 -0400 (EDT) From: John Baldwin To: Ruslan Ermilov cc: cvs-src@FreeBSD.org cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/release Makefile 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: Tue, 22 Jul 2003 18:26:18 -0000 On 22-Jul-2003 Ruslan Ermilov wrote: > On Tue, Jul 22, 2003 at 10:39:12AM -0400, John Baldwin wrote: >> On Tuesday 22 July 2003 05:04 am, Ruslan Ermilov wrote: >> > ru 2003/07/22 02:04:09 PDT >> > >> > FreeBSD src repository >> > >> > Modified files: >> > release Makefile >> > Log: >> > /floppies/boot.flp is no longer necessary on bootable i386 CD-ROMs. >> > >> > Forgotten by: jhb >> >> I left it there so that people can choose which method they want to use >> to make bootable CD's. It was intentional, not a bug. The method is >> chosen at mkisofs invocation time, not when laying out the hierarchy. >> > How they can choose it? They don't use MAKE_ISOS and invoke mkisofs on their own. I have never used MAKE_ISOS when building a release and have always used my own buildreliso script. > --- mkisoimages.sh 24 Jan 2002 10:44:15 -0000 1.6 > +++ mkisoimages.sh 11 Apr 2002 16:39:13 -0000 1.7 > @@ -4,7 +4,7 @@ > # Author: Jordan K Hubbard > # Date: 22 June 2001 > # > -# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.6 2002/01/24 10:44:15 murray Exp $ > +# $FreeBSD: src/release/i386/mkisoimages.sh,v 1.7 2002/04/11 16:39:13 jhb Exp $ > # > # This script is used by release/Makefile to build the (optional) ISO images > # for a FreeBSD release. It is considered architecture dependent since each > @@ -25,7 +25,7 @@ > if [ "x$1" = "x-b" ]; then > # This is highly x86-centric and will be used directly below. > - bootable="-b floppies/boot.flp -c floppies/boot.catalog" > + bootable="-b boot/cdboot -no-emul-boot" > shift > else > bootable="" > > > Cheers, > -- > Ruslan Ermilov Sysadmin and DBA, > ru@sunbay.com Sunbay Software Ltd, > ru@FreeBSD.org FreeBSD committer -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/