diff options
| author | pjd <pjd@FreeBSD.org> | 2011-10-20 15:46:54 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2011-10-20 15:46:54 +0000 |
| commit | 6eda6b7b3aec62169ee9ed7cbcd10a86dd19af2e (patch) | |
| tree | 1dc05e33d6e1864d1518f5ffb2921b7d214a6fd6 /sys | |
| parent | 57635fa52e9f95b6a653902df3016f529eecafed (diff) | |
| download | FreeBSD-src-6eda6b7b3aec62169ee9ed7cbcd10a86dd19af2e.zip FreeBSD-src-6eda6b7b3aec62169ee9ed7cbcd10a86dd19af2e.tar.gz | |
With LOADER_MBR_SUPPORT defined and LOADER_GPT_SUPPORT undefined we would
never call disk_openmbr().
Submitted by: avg
MFC after: 3 days
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/boot/common/disk.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/boot/common/disk.c b/sys/boot/common/disk.c index 8f753a8..81902c0 100644 --- a/sys/boot/common/disk.c +++ b/sys/boot/common/disk.c @@ -776,10 +776,11 @@ disk_open(struct disk_devdesc *dev) #ifdef LOADER_GPT_SUPPORT rc = disk_opengpt(dev); + if (rc == 0) + return (0); #endif #ifdef LOADER_MBR_SUPPORT - if (rc) - rc = disk_openmbr(dev); + rc = disk_openmbr(dev); #endif return (rc); |
