diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2005-12-22 03:02:49 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2005-12-22 03:02:49 +0000 |
| commit | 7073660ccb208705ca4f7a9a904281226199b00e (patch) | |
| tree | b5166ed14278f3fa73f97a39977acde1dcf93805 /sys/arch/mips64 | |
| parent | f75269fefeabcb37f1d4afb80af03b86acc4cd87 (diff) | |
'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@
Diffstat (limited to 'sys/arch/mips64')
| -rw-r--r-- | sys/arch/mips64/mips64/disksubr.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/arch/mips64/mips64/disksubr.c b/sys/arch/mips64/mips64/disksubr.c index caf266103a1..9399d596e5e 100644 --- a/sys/arch/mips64/mips64/disksubr.c +++ b/sys/arch/mips64/mips64/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.8 2005/09/27 23:56:12 krw Exp $ */ +/* $OpenBSD: disksubr.c,v 1.9 2005/12/22 03:02:48 krw Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -402,11 +402,6 @@ readdoslabel(bp, strat, lp, osdep, partoffp, cylp, 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; |