summaryrefslogtreecommitdiff
path: root/sys/arch/macppc
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2006-10-10 03:17:46 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2006-10-10 03:17:46 +0000
commitc2d0836b8e2158302cb1e6a389fe9a561a9e1501 (patch)
treede3368df58051a08e3e3401e51913c527a6528a4 /sys/arch/macppc
parentdc8d0c42a03c25fdf64c58d17fc94f81dd2782d7 (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/macppc')
-rw-r--r--sys/arch/macppc/macppc/disksubr.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/sys/arch/macppc/macppc/disksubr.c b/sys/arch/macppc/macppc/disksubr.c
index 59014a23118..2f22cf0fda2 100644
--- a/sys/arch/macppc/macppc/disksubr.c
+++ b/sys/arch/macppc/macppc/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.24 2006/10/04 03:23:01 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.25 2006/10/10 03:17:45 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -216,16 +216,6 @@ hfs_done:
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;
/*