summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/alpha/alpha/disksubr.c4
-rw-r--r--sys/arch/amd64/amd64/disksubr.c4
-rw-r--r--sys/arch/arm/arm/disksubr.c4
-rw-r--r--sys/arch/aviion/aviion/disksubr.c4
-rw-r--r--sys/arch/hppa/hppa/disksubr.c4
-rw-r--r--sys/arch/hppa64/hppa64/disksubr.c4
-rw-r--r--sys/arch/i386/i386/disksubr.c4
-rw-r--r--sys/arch/landisk/landisk/disksubr.c4
-rw-r--r--sys/arch/macppc/macppc/disksubr.c4
-rw-r--r--sys/arch/mips64/mips64/disksubr.c4
-rw-r--r--sys/arch/mvmeppc/mvmeppc/disksubr.c4
11 files changed, 22 insertions, 22 deletions
diff --git a/sys/arch/alpha/alpha/disksubr.c b/sys/arch/alpha/alpha/disksubr.c
index d15e4613535..84cdd9e5a3b 100644
--- a/sys/arch/alpha/alpha/disksubr.c
+++ b/sys/arch/alpha/alpha/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.63 2006/10/21 20:10:39 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.64 2006/10/28 23:26:05 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -265,7 +265,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++)
diff --git a/sys/arch/amd64/amd64/disksubr.c b/sys/arch/amd64/amd64/disksubr.c
index dbc07be3e80..1cabcc636a1 100644
--- a/sys/arch/amd64/amd64/disksubr.c
+++ b/sys/arch/amd64/amd64/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.24 2006/10/21 20:10:39 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.25 2006/10/28 23:26:05 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -125,7 +125,7 @@ readdisklabel(dev, strat, lp, osdep, 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++)
diff --git a/sys/arch/arm/arm/disksubr.c b/sys/arch/arm/arm/disksubr.c
index 7aa73a25b29..e8ae4842ca3 100644
--- a/sys/arch/arm/arm/disksubr.c
+++ b/sys/arch/arm/arm/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.22 2006/10/21 20:10:39 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.23 2006/10/28 23:26:05 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -125,7 +125,7 @@ readdisklabel(dev, strat, lp, osdep, 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++)
diff --git a/sys/arch/aviion/aviion/disksubr.c b/sys/arch/aviion/aviion/disksubr.c
index 4ce153e11c5..11aebf5cc78 100644
--- a/sys/arch/aviion/aviion/disksubr.c
+++ b/sys/arch/aviion/aviion/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.13 2006/10/21 20:10:39 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.14 2006/10/28 23:26:05 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -125,7 +125,7 @@ readdisklabel(dev, strat, lp, osdep, 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++)
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++)
diff --git a/sys/arch/hppa64/hppa64/disksubr.c b/sys/arch/hppa64/hppa64/disksubr.c
index 95501371a51..4f933fd0387 100644
--- a/sys/arch/hppa64/hppa64/disksubr.c
+++ b/sys/arch/hppa64/hppa64/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.26 2006/10/21 20:10:39 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.27 2006/10/28 23:26:05 krw Exp $ */
/*
* Copyright (c) 1999 Michael Shalayeff
@@ -264,7 +264,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++)
diff --git a/sys/arch/i386/i386/disksubr.c b/sys/arch/i386/i386/disksubr.c
index c74021103a7..81cec55ab01 100644
--- a/sys/arch/i386/i386/disksubr.c
+++ b/sys/arch/i386/i386/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.66 2006/10/21 20:10:39 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.67 2006/10/28 23:26:05 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -121,7 +121,7 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp,
}
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++)
diff --git a/sys/arch/landisk/landisk/disksubr.c b/sys/arch/landisk/landisk/disksubr.c
index ddf101269f2..c155ede424f 100644
--- a/sys/arch/landisk/landisk/disksubr.c
+++ b/sys/arch/landisk/landisk/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.10 2006/10/21 20:10:39 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.11 2006/10/28 23:26:05 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -125,7 +125,7 @@ readdisklabel(dev, strat, lp, osdep, 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++)
diff --git a/sys/arch/macppc/macppc/disksubr.c b/sys/arch/macppc/macppc/disksubr.c
index 1def3fb4cce..38406a38546 100644
--- a/sys/arch/macppc/macppc/disksubr.c
+++ b/sys/arch/macppc/macppc/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.32 2006/10/21 20:10:39 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.33 2006/10/28 23:26:05 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -208,7 +208,7 @@ hfs_done:
}
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++)
diff --git a/sys/arch/mips64/mips64/disksubr.c b/sys/arch/mips64/mips64/disksubr.c
index 5d75837567b..8d0af4f699d 100644
--- a/sys/arch/mips64/mips64/disksubr.c
+++ b/sys/arch/mips64/mips64/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.32 2006/10/21 20:10:39 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.33 2006/10/28 23:26:05 krw Exp $ */
/*
* Copyright (c) 1999 Michael Shalayeff
@@ -272,7 +272,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++)
diff --git a/sys/arch/mvmeppc/mvmeppc/disksubr.c b/sys/arch/mvmeppc/mvmeppc/disksubr.c
index 9cfd38a004a..d78c27f05ea 100644
--- a/sys/arch/mvmeppc/mvmeppc/disksubr.c
+++ b/sys/arch/mvmeppc/mvmeppc/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.28 2006/10/21 20:10:39 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.29 2006/10/28 23:26:05 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -128,7 +128,7 @@ readdisklabel(dev, strat, lp, osdep, 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++)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 16:36:36 +0000