Eliminate CPU_BIOS from userland and wd(4) by always using the BIOS

geometry in the disklabel when there is a BIOS geometry to provide.
This removes the option to set a disklabel to 'BIOS' geometry via the
'g b' command in the editor.

Makes reported geometry more consistant and moves MD code to MD land
where it should be.

Doc help from jmc@, Feedback from millert@, marco@, weingart@,
kettenis@.

ok deraadt@

1 files changed, 4 insertions, 6 deletions

diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index e7bcb6f976d..c1fdd91b5c1 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.c,v 1.106 2007/04/26 02:43:29 ray Exp $	*/
+/*	$OpenBSD: disklabel.c,v 1.107 2007/04/26 22:42:11 krw Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993
@@ -39,7 +39,7 @@ static const char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.106 2007/04/26 02:43:29 ray Exp $";
+static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.107 2007/04/26 22:42:11 krw Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -602,9 +602,8 @@ readmbr(int f)
 	bcopy((char *)mbr+DOSPARTOFF, (char *)mbr, sizeof(*dp) * NDOSPART);
 
 	/*
-	 * Don't (yet) know disk geometry (BIOS), use
-	 * partition table to find OpenBSD partition, and obtain
-	 * disklabel from there.
+	 * Don't (yet) know disk geometry, use partition table to find OpenBSD
+	 * partition, and obtain disklabel from there.
 	 */
 	/* Check if table is valid. */
 	for (part = 0; part < NDOSPART; part++) {
@@ -1597,7 +1596,6 @@ checklabel(struct disklabel *lp)
 		errors++;
 		lp->d_secperunit = dosdp->dp_start + dosdp->dp_size;
 	}
-	/* XXX should also check geometry against BIOS's idea */
 #endif
 	if (lp->d_bbsize == 0) {
 		warnx("boot block size %d", lp->d_bbsize);