From owner-svn-src-all@FreeBSD.ORG  Mon Jun 15 16:18:24 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A210410656B0;
	Mon, 15 Jun 2009 16:18:24 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 903D48FC08;
	Mon, 15 Jun 2009 16:18:24 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5FGIOtG094445;
	Mon, 15 Jun 2009 16:18:24 GMT (envelope-from lulf@svn.freebsd.org)
Received: (from lulf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5FGIO0o094444;
	Mon, 15 Jun 2009 16:18:24 GMT (envelope-from lulf@svn.freebsd.org)
Message-Id: <200906151618.n5FGIO0o094444@svn.freebsd.org>
From: Ulf Lilleengen <lulf@FreeBSD.org>
Date: Mon, 15 Jun 2009 16:18:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194241 - head/lib/libdisk
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Jun 2009 16:18:25 -0000

Author: lulf
Date: Mon Jun 15 16:18:24 2009
New Revision: 194241
URL: http://svn.freebsd.org/changeset/base/194241

Log:
  - Relax sanitazion requirements in libdisk, as a previous commit enabling this
    sanitization broke sysinstall on some disks.  This was due to the disks
    reporting a geometry that was incorrectly sanitized by sysinstall. This makes
    the sanitization consistent with fdisk.
  
  Tested by:	randi

Modified:
  head/lib/libdisk/change.c

Modified: head/lib/libdisk/change.c
==============================================================================
--- head/lib/libdisk/change.c	Mon Jun 15 15:43:00 2009	(r194240)
+++ head/lib/libdisk/change.c	Mon Jun 15 16:18:24 2009	(r194241)
@@ -34,17 +34,9 @@ Sanitize_Bios_Geom(struct disk *disk)
 
 	sane = 1;
 
-#ifdef PC98
 	if (disk->bios_cyl >= 65536)
-#else
-	if (disk->bios_cyl > 1024)
-#endif
 		sane = 0;
-#ifdef PC98
-	if (disk->bios_hd >= 256)
-#else
-	if (disk->bios_hd > 16)
-#endif
+	if (disk->bios_hd > 256)
 		sane = 0;
 #ifdef PC98
 	if (disk->bios_sect >= 256)