From 7073660ccb208705ca4f7a9a904281226199b00e Mon Sep 17 00:00:00 2001 From: Kenneth R Westerback Date: Thu, 22 Dec 2005 03:02:49 +0000 Subject: 'spoofonly' does not mean what I thought it meant. The whole point is to read non-OpenBSD label information like MBRs and populate ('spoof') the OpenBSD disk label appropriately. So avoiding an I/O when doing 'spoofonly' is to miss the whole point. Backout all Sept. 26 and subsequent changes to disksubr.c files. The original CD problem with I/O errors on blank media will be addressed another way. Should fix the ext3 vs amd64 problems discussed on misc@. Thanks to steven@ for finally putting it terms that I understood. ok deraadt@ --- sys/arch/amd64/amd64/disksubr.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'sys/arch/amd64') diff --git a/sys/arch/amd64/amd64/disksubr.c b/sys/arch/amd64/amd64/disksubr.c index 28d6bd5fda6..21839b95fff 100644 --- a/sys/arch/amd64/amd64/disksubr.c +++ b/sys/arch/amd64/amd64/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.5 2005/12/13 00:18:19 jsg Exp $ */ +/* $OpenBSD: disksubr.c,v 1.6 2005/12/22 03:02:48 krw Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -122,11 +122,6 @@ readdisklabel(dev, strat, lp, osdep, spoofonly) if (part_blkno < extoff) part_blkno = extoff; - if (spoofonly) { - bzero(dp, NDOSPART * sizeof(*dp)); - goto donot; - } - /* read boot record */ bp->b_blkno = part_blkno; bp->b_bcount = lp->d_secsize; -- cgit v1.2.3