diff options
| author |   krw <krw@openbsd.org> | 2015-08-26 13:56:04 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2015-08-26 13:56:04 +0000 |
| commit | bf9f944248707792a5966c45794c8837fee89857 (patch) | |
| tree | ababe33c478a330c1aed87408d2c5a96fb4f0ece | |
| parent | Use the specialized m_copym2() preserving the alignment of the payload (diff) | |
| download | wireguard-openbsd-bf9f944248707792a5966c45794c8837fee89857.tar.xz wireguard-openbsd-bf9f944248707792a5966c45794c8837fee89857.zip | |
MBR must have priority over GPT.
Found, fix tested & thus ok ajacoutot@
| -rw-r--r-- | sys/arch/amd64/amd64/disksubr.c | 10 | ||||
| -rw-r--r-- | sys/arch/i386/i386/disksubr.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/amd64/amd64/disksubr.c b/sys/arch/amd64/amd64/disksubr.c index 6ffa135bb01..0faca1ad128 100644 --- a/sys/arch/amd64/amd64/disksubr.c +++ b/sys/arch/amd64/amd64/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.72 2015/07/23 18:02:58 krw Exp $ */ +/* $OpenBSD: disksubr.c,v 1.73 2015/08/26 13:56:04 krw Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -94,15 +94,15 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *), bp = geteblk((int)lp->d_secsize); bp->b_dev = dev; -#if defined(GPT) - error = readgptlabel(bp, strat, lp, NULL, spoofonly); + error = readdoslabel(bp, strat, lp, NULL, spoofonly); if (error == 0) goto done; -#endif - error = readdoslabel(bp, strat, lp, NULL, spoofonly); +#if defined(GPT) + error = readgptlabel(bp, strat, lp, NULL, spoofonly); if (error == 0) goto done; +#endif #if defined(CD9660) error = iso_disklabelspoof(dev, strat, lp); diff --git a/sys/arch/i386/i386/disksubr.c b/sys/arch/i386/i386/disksubr.c index a84a51d12d5..3e4375dcd06 100644 --- a/sys/arch/i386/i386/disksubr.c +++ b/sys/arch/i386/i386/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.110 2015/07/23 18:02:58 krw Exp $ */ +/* $OpenBSD: disksubr.c,v 1.111 2015/08/26 13:56:04 krw Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -93,15 +93,15 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *), bp = geteblk((int)lp->d_secsize); bp->b_dev = dev; -#if defined(GPT) - error = readgptlabel(bp, strat, lp, NULL, spoofonly); + error = readdoslabel(bp, strat, lp, NULL, spoofonly); if (error == 0) goto done; -#endif - error = readdoslabel(bp, strat, lp, NULL, spoofonly); +#if defined(GPT) + error = readgptlabel(bp, strat, lp, NULL, spoofonly); if (error == 0) goto done; +#endif #if defined(CD9660) error = iso_disklabelspoof(dev, strat, lp); |