From owner-freebsd-current@FreeBSD.ORG  Mon Jun 27 21:25:20 2005
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
X-Original-To: freebsd-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 2321616A41C;
	Mon, 27 Jun 2005 21:25:20 +0000 (GMT) (envelope-from jhb@FreeBSD.org)
Received: from mv.twc.weather.com (mv.twc.weather.com [65.212.71.225])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B22D443D1D;
	Mon, 27 Jun 2005 21:25:19 +0000 (GMT) (envelope-from jhb@FreeBSD.org)
Received: from [10.50.41.231] (Not Verified[65.202.103.25]) by
	mv.twc.weather.com with NetIQ MailMarshal (v6, 0, 3, 8)
	id <B42c071f60000>; Mon, 27 Jun 2005 17:39:02 -0400
From: John Baldwin <jhb@FreeBSD.org>
To: freebsd-current@freebsd.org
Date: Mon, 27 Jun 2005 17:01:43 -0400
User-Agent: KMail/1.8
References: <20050618173102.R73598@carver.gumbysoft.com>
In-Reply-To: <20050618173102.R73598@carver.gumbysoft.com>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200506271701.45080.jhb@FreeBSD.org>
Cc: 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
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Jun 2005 21:25:20 -0000

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.

-- 
John Baldwin <jhb@FreeBSD.org>  <><  http://www.FreeBSD.org/~jhb/
"Power Users Use the Power to Serve"  =  http://www.FreeBSD.org