In dkcsumattach() avoid modifying bootdev until we are done matching.

Also deal with mixed scsi/ide/whatever setups.  Based on a diff from
Fred de Jong.  OK deraadt@ and tested by several people.

2 files changed, 48 insertions, 10 deletions

diff --git a/sys/arch/amd64/amd64/dkcsum.c b/sys/arch/amd64/amd64/dkcsum.c
index e1c4e285863..8757875fb45 100644
--- a/sys/arch/amd64/amd64/dkcsum.c
+++ b/sys/arch/amd64/amd64/dkcsum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dkcsum.c,v 1.1 2004/02/25 00:16:04 deraadt Exp $	*/
+/*	$OpenBSD: dkcsum.c,v 1.2 2004/08/11 18:51:04 millert Exp $	*/
 
 /*-
  * Copyright (c) 1997 Niklas Hallqvist.  All rights reserved.
@@ -58,7 +58,7 @@ dkcsumattach(void)
 	struct device *dv;
 	struct buf *bp;
 	struct bdevsw *bdsw;
-	dev_t dev;
+	dev_t dev, pribootdev, altbootdev;
 	int error;
 	u_int32_t csum;
 	bios_diskinfo_t *bdi, *hit;
@@ -67,6 +67,8 @@ dkcsumattach(void)
 	if (bios_diskinfo == NULL || bios_cksumlen * DEV_BSIZE > MAXBSIZE)
 		return;
 
+	pribootdev = altbootdev = 0;
+
 	/*
 	 * XXX Whatif DEV_BSIZE is changed to something else than the BIOS
 	 * blocksize?  Today, /boot doesn't cover that case so neither need
@@ -164,22 +166,37 @@ dkcsumattach(void)
 			continue;
 		}
 
-		/* Fixup bootdev if units match.  This means that all of
+		/*
+		 * Fixup bootdev if units match.  This means that all of
 		 * hd*, sd*, wd*, will be interpreted the same.  Not 100%
 		 * backwards compatible, but sd* and wd* should be phased-
 		 * out in the bootblocks.
 		 */
+
+		/* B_TYPE dependent hd unit counting bootblocks */ 
+		if ((B_TYPE(bootdev) == B_TYPE(hit->bsd_dev)) &&
+		    (B_UNIT(bootdev) == B_UNIT(hit->bsd_dev))) {
+			int type, ctrl, adap, part, unit;
+
+			type = major(bp->b_dev);
+			adap = B_ADAPTOR(bootdev);
+			ctrl = B_CONTROLLER(bootdev);
+			unit = DISKUNIT(bp->b_dev);
+			part = B_PARTITION(bootdev);
+
+			pribootdev = MAKEBOOTDEV(type, ctrl, adap, unit, part);
+		}
+		/* B_TYPE independent hd unit counting bootblocks */
 		if (B_UNIT(bootdev) == (hit->bios_number & 0x7F)) {
 			int type, ctrl, adap, part, unit;
 
-			/* Translate to MAKEBOOTDEV() style */
 			type = major(bp->b_dev);
 			adap = B_ADAPTOR(bootdev);
 			ctrl = B_CONTROLLER(bootdev);
 			unit = DISKUNIT(bp->b_dev);
 			part = B_PARTITION(bootdev);
 
-			bootdev = MAKEBOOTDEV(type, ctrl, adap, unit, part);
+			altbootdev = MAKEBOOTDEV(type, ctrl, adap, unit, part);
 		}
 
 		/* This will overwrite /boot's guess, just so you remember */
@@ -187,6 +204,8 @@ dkcsumattach(void)
 		    DISKUNIT(bp->b_dev), RAW_PART);
 		hit->flags |= BDI_PICKED;
 	}
+	bootdev = pribootdev ? pribootdev : altbootdev ? altbootdev : bootdev;
+
 	bp->b_flags |= B_INVAL;
 	brelse(bp);
 }
diff --git a/sys/arch/i386/i386/dkcsum.c b/sys/arch/i386/i386/dkcsum.c
index 3122a8b2612..7071689ad1f 100644
--- a/sys/arch/i386/i386/dkcsum.c
+++ b/sys/arch/i386/i386/dkcsum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dkcsum.c,v 1.11 2003/06/03 20:31:07 deraadt Exp $	*/
+/*	$OpenBSD: dkcsum.c,v 1.12 2004/08/11 18:51:03 millert Exp $	*/
 
 /*-
  * Copyright (c) 1997 Niklas Hallqvist.  All rights reserved.
@@ -58,7 +58,7 @@ dkcsumattach()
 	struct device *dv;
 	struct buf *bp;
 	struct bdevsw *bdsw;
-	dev_t dev;
+	dev_t dev, pribootdev, altbootdev;
 	int error;
 	u_int32_t csum;
 	bios_diskinfo_t *bdi, *hit;
@@ -67,6 +67,8 @@ dkcsumattach()
 	if (bios_diskinfo == NULL || bios_cksumlen * DEV_BSIZE > MAXBSIZE)
 		return;
 
+	pribootdev = altbootdev = 0;
+
 	/*
 	 * XXX Whatif DEV_BSIZE is changed to something else than the BIOS
 	 * blocksize?  Today, /boot doesn't cover that case so neither need
@@ -163,22 +165,37 @@ dkcsumattach()
 			continue;
 		}
 
-		/* Fixup bootdev if units match.  This means that all of
+		/*
+		 * Fixup bootdev if units match.  This means that all of
 		 * hd*, sd*, wd*, will be interpreted the same.  Not 100%
 		 * backwards compatible, but sd* and wd* should be phased-
 		 * out in the bootblocks.
 		 */
+
+		/* B_TYPE dependent hd unit counting bootblocks */ 
+		if ((B_TYPE(bootdev) == B_TYPE(hit->bsd_dev)) &&
+		    (B_UNIT(bootdev) == B_UNIT(hit->bsd_dev))) {
+			int type, ctrl, adap, part, unit;
+
+			type = major(bp->b_dev);
+			adap = B_ADAPTOR(bootdev);
+			ctrl = B_CONTROLLER(bootdev);
+			unit = DISKUNIT(bp->b_dev);
+			part = B_PARTITION(bootdev);
+
+			pribootdev = MAKEBOOTDEV(type, ctrl, adap, unit, part);
+		}
+		/* B_TYPE independent hd unit counting bootblocks */
 		if (B_UNIT(bootdev) == (hit->bios_number & 0x7F)) {
 			int type, ctrl, adap, part, unit;
 
-			/* Translate to MAKEBOOTDEV() style */
 			type = major(bp->b_dev);
 			adap = B_ADAPTOR(bootdev);
 			ctrl = B_CONTROLLER(bootdev);
 			unit = DISKUNIT(bp->b_dev);
 			part = B_PARTITION(bootdev);
 
-			bootdev = MAKEBOOTDEV(type, ctrl, adap, unit, part);
+			altbootdev = MAKEBOOTDEV(type, ctrl, adap, unit, part);
 		}
 
 		/* This will overwrite /boot's guess, just so you remember */
@@ -186,6 +203,8 @@ dkcsumattach()
 		    DISKUNIT(bp->b_dev), RAW_PART);
 		hit->flags |= BDI_PICKED;
 	}
+	bootdev = pribootdev ? pribootdev : altbootdev ? altbootdev : bootdev;
+
 	bp->b_flags |= B_INVAL;
 	brelse(bp);
 }