diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/stand/libsa/biosdev.c | 11 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/biosdev.c | 12 | ||||
| -rw-r--r-- | sys/arch/macppc/stand/ofdev.c | 5 | ||||
| -rw-r--r-- | sys/arch/mvmeppc/stand/libsa/bugdev.c | 5 |
4 files changed, 8 insertions, 25 deletions
diff --git a/sys/arch/amd64/stand/libsa/biosdev.c b/sys/arch/amd64/stand/libsa/biosdev.c index 3265a5ff2f5..29516e4c77b 100644 --- a/sys/arch/amd64/stand/libsa/biosdev.c +++ b/sys/arch/amd64/stand/libsa/biosdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: biosdev.c,v 1.2 2004/08/21 18:53:38 tom Exp $ */ +/* $OpenBSD: biosdev.c,v 1.3 2006/10/12 12:14:17 krw Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -362,15 +362,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; 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; diff --git a/sys/arch/macppc/stand/ofdev.c b/sys/arch/macppc/stand/ofdev.c index d989ca58b51..fc4e952b62c 100644 --- a/sys/arch/macppc/stand/ofdev.c +++ b/sys/arch/macppc/stand/ofdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofdev.c,v 1.8 2003/10/16 04:30:09 drahn Exp $ */ +/* $OpenBSD: ofdev.c,v 1.9 2006/10/12 12:14:17 krw Exp $ */ /* $NetBSD: ofdev.c,v 1.1 1997/04/16 20:29:20 thorpej Exp $ */ /* @@ -275,8 +275,7 @@ search_label(devp, off, buf, lp, off0) off0 += off; for (p = (struct dos_partition *)(buf + DOSPARTOFF), i = 4; --i >= 0; p++) { - if (p->dp_typ == DOSPTYP_OPENBSD || - p->dp_typ == DOSPTYP_NETBSD) { + if (p->dp_typ == DOSPTYP_OPENBSD) { poff = get_long(&p->dp_start) + off0; if (strategy(devp, F_READ, poff + LABELSECTOR, DEV_BSIZE, buf, &read) == 0 diff --git a/sys/arch/mvmeppc/stand/libsa/bugdev.c b/sys/arch/mvmeppc/stand/libsa/bugdev.c index 20b4f8d562e..f5b466a5d25 100644 --- a/sys/arch/mvmeppc/stand/libsa/bugdev.c +++ b/sys/arch/mvmeppc/stand/libsa/bugdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bugdev.c,v 1.3 2004/01/26 18:39:20 miod Exp $ */ +/* $OpenBSD: bugdev.c,v 1.4 2006/10/12 12:14:17 krw Exp $ */ /* * Copyright (c) 1993 Paul Kranenburg @@ -192,8 +192,7 @@ search_label(devp, off, buf, lp, off0) off0 += off; for (p = (struct dos_partition *)(buf + DOSPARTOFF), i = 4; --i >= 0; p++) { - if (p->dp_typ == DOSPTYP_OPENBSD || - p->dp_typ == DOSPTYP_NETBSD) { + if (p->dp_typ == DOSPTYP_OPENBSD) { poff = get_long(&p->dp_start) + off0; if (dsk_strategy(devp, F_READ, poff + LABELSECTOR, DEV_BSIZE, buf, &read) == 0 |