diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-10-12 12:14:18 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-10-12 12:14:18 +0000 |
| commit | 9f8580cbda229e758d23a09a700ee1c369cecfc5 (patch) | |
| tree | db28025f3bfad62a75aff3fb73c62fda39c68837 /sys/arch/i386/stand/libsa | |
| parent | 1f4bf3fa4edee3198c88dc49abdbd630066c1f41 (diff) | |
Don't try to boot from a NetBSD MBR partition when no OpenBSD MBR
partition is found. Change error message to 'no OpenBSD partition'.
Diffstat (limited to 'sys/arch/i386/stand/libsa')
| -rw-r--r-- | sys/arch/i386/stand/libsa/biosdev.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sys/arch/i386/stand/libsa/biosdev.c b/sys/arch/i386/stand/libsa/biosdev.c index 84a0387e1d4..4a9e6b206a5 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.69 2004/06/23 00:21:49 tom Exp $ */ +/* $OpenBSD: biosdev.c,v 1.70 2006/10/12 12:14:17 krw Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -365,16 +365,8 @@ bios_getdisklabel(bios_diskinfo_t *bd, struct disklabel *label) for (off = 0, i = 0; off == 0 && i < NDOSPART; i++) if (mbr.dmbr_parts[i].dp_typ == DOSPTYP_OPENBSD) off = mbr.dmbr_parts[i].dp_start + LABELSECTOR; - - /* just in case */ - if (off == 0) - for (off = 0, i = 0; off == 0 && i < NDOSPART; i++) - if (mbr.dmbr_parts[i].dp_typ == DOSPTYP_NETBSD) - off = mbr.dmbr_parts[i].dp_start + - LABELSECTOR; - if (off == 0) - return "no BSD partition\n"; + return "no OpenBSD partition\n"; } else off = LABELSECTOR; |