From owner-freebsd-current@FreeBSD.ORG Wed Jun 29 06:10:34 2005 Return-Path: X-Original-To: current@freebsd.org Delivered-To: freebsd-current@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E30FE16A41C; Wed, 29 Jun 2005 06:10:34 +0000 (GMT) (envelope-from dwhite@gumbysoft.com) Received: from carver.gumbysoft.com (carver.gumbysoft.com [66.220.23.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id CCB2D43D55; Wed, 29 Jun 2005 06:10:34 +0000 (GMT) (envelope-from dwhite@gumbysoft.com) Received: by carver.gumbysoft.com (Postfix, from userid 1000) id B3E8972DD4; Tue, 28 Jun 2005 23:10:34 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by carver.gumbysoft.com (Postfix) with ESMTP id AE11C72DCB; Tue, 28 Jun 2005 23:10:34 -0700 (PDT) Date: Tue, 28 Jun 2005 23:10:34 -0700 (PDT) From: Doug White To: John Baldwin In-Reply-To: <200506271701.45080.jhb@FreeBSD.org> Message-ID: <20050628230944.I3088@carver.gumbysoft.com> References: <20050618173102.R73598@carver.gumbysoft.com> <200506271701.45080.jhb@FreeBSD.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: freebsd-current@freebsd.org, current@freebsd.org Subject: Re: Patch for sysinstall wrong-disc problem X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jun 2005 06:10:35 -0000 On Mon, 27 Jun 2005, John Baldwin wrote: > On Saturday 18 June 2005 08:33 pm, Doug White wrote: > > Hey folks, > > > > I've come up with a patch that fixes sysinstall prompting for the wrong CD > > when trying to install packages from non-CDROM media. Patch is here: > > > > http://people.freebsd.org/~dwhite/patches/index.c.20050618.patch > > > > This makes the "This is disc#0; I need disc#1" type message go away by > > checking if the install media is a CDROM first. Tested with an install > > over NFS, but it shouldn't make a difference what install media as long as > > its not a CD. > > > > I'll commit this shortly if there are no objections. > > Just a suggestion: it might be a shorter patch with no need to reindent a > bunch of code if you change the patch to just add > > if (mediaDevice->type != DEVICE_TYPE_CDROM) > return (DITEM_FAILURE); > > before the while loop. That'd be wrong; I'm only trying to skip the logic that does the CDROM frobbing. I need the rest of the function so it loads the package :) Thanks for reminding me to commit this though :) -- Doug White | FreeBSD: The Power to Serve dwhite@gumbysoft.com | www.FreeBSD.org