Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Oct 2011 15:46:54 +0000 (UTC)
From:      Pawel Jakub Dawidek <pjd@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r226569 - head/sys/boot/common
Message-ID:  <201110201546.p9KFksT4080949@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pjd
Date: Thu Oct 20 15:46:54 2011
New Revision: 226569
URL: http://svn.freebsd.org/changeset/base/226569

Log:
  With LOADER_MBR_SUPPORT defined and LOADER_GPT_SUPPORT undefined we would
  never call disk_openmbr().
  
  Submitted by:	avg
  MFC after:	3 days

Modified:
  head/sys/boot/common/disk.c

Modified: head/sys/boot/common/disk.c
==============================================================================
--- head/sys/boot/common/disk.c	Thu Oct 20 15:42:38 2011	(r226568)
+++ head/sys/boot/common/disk.c	Thu Oct 20 15:46:54 2011	(r226569)
@@ -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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110201546.p9KFksT4080949>