diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-10-12 00:25:21 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-10-12 00:25:21 +0000 |
| commit | 1eee43099356da9c6aa1e08d66c50f951088433d (patch) | |
| tree | 79ab2cb63bcedb0425fe9dac8b2bae67814d76a4 /sys/arch/i386 | |
| parent | b3e0f59f6a1b88f413155ed43999863b9044ca07 (diff) | |
Since we no longer look in FreeBSD or NetBSD partitions for the
disklabel, we shouldn't write the disklabel in such partitions either.
Brings amd64, arm, i386, landisk, macppc, mvmeppc (which roll their
own MBR search in writedisklabel()) into line with alpha, hppa,
hppa64, mips64 (which use readdoslabel() in both reading and writing
the disklabel). If all goes well, soon everyone will be using
readdoslabel().
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/i386/disksubr.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/arch/i386/i386/disksubr.c b/sys/arch/i386/i386/disksubr.c index dc60910e53c..a416edda3af 100644 --- a/sys/arch/i386/i386/disksubr.c +++ b/sys/arch/i386/i386/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.59 2006/10/10 03:17:45 krw Exp $ */ +/* $OpenBSD: disksubr.c,v 1.60 2006/10/12 00:25:20 krw Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -367,12 +367,6 @@ writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, for (dp2=dp, i=0; i < NDOSPART && ourpart == -1; i++, dp2++) 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) { dp2 = &dp[ourpart]; |