From 4e0f1e78370ad55cf306abe9f217f5034545699a Mon Sep 17 00:00:00 2001 From: Kenneth R Westerback Date: Sat, 28 Oct 2006 23:26:06 +0000 Subject: We don't currently write a disklabel into an OpenBSD ('A6') DOS MBR extended partition except on alpha, hppa, hppa64 and mips64. So don't spoof extended partitions as 'a' and try to read a disklabel from them. Make all archs consistant. When we can boot from extended partitions we can change to reading and writing disklabels from them. This means the first OpenBSD ('A6') extended partition will now be ignored during spoofing, just as subsequent ones have always been. Feedback from tom@, weingart@ and deraadt@. --- sys/arch/hppa/hppa/disksubr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/arch/hppa') diff --git a/sys/arch/hppa/hppa/disksubr.c b/sys/arch/hppa/hppa/disksubr.c index df031b5167f..2b2d228f142 100644 --- a/sys/arch/hppa/hppa/disksubr.c +++ b/sys/arch/hppa/hppa/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.43 2006/10/21 20:10:39 krw Exp $ */ +/* $OpenBSD: disksubr.c,v 1.44 2006/10/28 23:26:05 krw Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -268,7 +268,7 @@ readdoslabel(bp, strat, lp, osdep, partoffp, cylp, spoofonly) } bcopy(bp->b_data + DOSPARTOFF, dp, sizeof(dp)); - if (ourpart == -1) { + if (ourpart == -1 && part_blkno == DOSBBSECTOR) { /* Search for our MBR partition */ for (dp2=dp, i=0; i < NDOSPART && ourpart == -1; i++, dp2++) -- cgit v1.2.3