diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-10-10 03:17:46 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-10-10 03:17:46 +0000 |
| commit | c2d0836b8e2158302cb1e6a389fe9a561a9e1501 (patch) | |
| tree | de3368df58051a08e3e3401e51913c527a6528a4 /sys/arch/mips64 | |
| parent | dc8d0c42a03c25fdf64c58d17fc94f81dd2782d7 (diff) | |
Don't spoof a Free/NetBSD MBR partition as the 'a' partition in a
disklabel. Fixes 'double spoofing' of these partitions as both 'a' and
something in the 'i' to 'p' range.
OpenBSD changed its MBR partition type to 'A6' eight years ago. As a
backward compatibility measure NetBSD and FreeBSD MBR partitions were
still spoofed as 'a' partitions when no OpenBSD partition could be
found. This bit of backward compatibility is no longer required.
'we can get rid of it' deraadt@
Diffstat (limited to 'sys/arch/mips64')
| -rw-r--r-- | sys/arch/mips64/mips64/disksubr.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sys/arch/mips64/mips64/disksubr.c b/sys/arch/mips64/mips64/disksubr.c index 3aef50f09ce..c7433bdb1f3 100644 --- a/sys/arch/mips64/mips64/disksubr.c +++ b/sys/arch/mips64/mips64/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.25 2006/10/04 23:58:12 krw Exp $ */ +/* $OpenBSD: disksubr.c,v 1.26 2006/10/10 03:17:45 krw Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -280,16 +280,6 @@ readdoslabel(bp, strat, lp, osdep, partoffp, cylp, spoofonly) if (letoh32(dp2->dp_size) && dp2->dp_typ == DOSPTYP_OPENBSD) ourpart = i; - for (dp2=dp, i=0; i < NDOSPART && ourpart == -1; - i++, dp2++) - if (letoh32(dp2->dp_size) && - dp2->dp_typ == DOSPTYP_FREEBSD) - ourpart = i; - for (dp2=dp, i=0; i < NDOSPART && ourpart == -1; - i++, dp2++) - if (letoh32(dp2->dp_size) && - dp2->dp_typ == DOSPTYP_NETBSD) - ourpart = i; if (ourpart == -1) goto donot; /* |