summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1997-10-28 23:33:50 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1997-10-28 23:33:50 +0000
commit0418a2a6804fe1adfd93df3e618ea10d262d98cd (patch)
tree8aaad936ab5656ae4859f8519ccbdaec59e1b2a7 /sys/arch/i386
parent6b5d80b68850588ee41fa1f786ef6c43a4f1c6b5 (diff)
do not replace unit number in bootdev. please talk to me about this.
this makes it so that when booting sd0 on a wd0/sd0/sd1 system the kernel doesn't get told we are booting from sd1 (ie. scsi, but it is hd1..).
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/stand/libsa/biosdev.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/i386/stand/libsa/biosdev.c b/sys/arch/i386/stand/libsa/biosdev.c
index 4b0ab337154..25c335a870b 100644
--- a/sys/arch/i386/stand/libsa/biosdev.c
+++ b/sys/arch/i386/stand/libsa/biosdev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: biosdev.c,v 1.45 1997/10/26 22:33:00 mickey Exp $ */
+/* $OpenBSD: biosdev.c,v 1.46 1997/10/28 23:33:49 deraadt Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff
@@ -399,8 +399,10 @@ biosopen(struct open_file *f, ...)
return ENXIO;
bootdev = bd->bios_info->bsd_dev;
- bd->bsddev = bootdev = MAKEBOOTDEV(B_TYPE(bootdev), B_ADAPTOR(bootdev),
+ bd->bsddev = MAKEBOOTDEV(B_TYPE(bootdev), B_ADAPTOR(bootdev),
B_CONTROLLER(bootdev), unit, part);
+ bootdev = MAKEBOOTDEV(B_TYPE(bootdev), B_ADAPTOR(bootdev),
+ B_CONTROLLER(bootdev), B_UNIT(bootdev), part);
#ifdef BIOS_DEBUG
if (debug) {