Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 23 Oct 2008 15:44:00 +0000 (UTC)
From:      Marcel Moolenaar <marcel@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r184204 - in stable/7/sys: . geom/part
Message-ID:  <200810231544.m9NFi0E1060412@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marcel
Date: Thu Oct 23 15:44:00 2008
New Revision: 184204
URL: http://svn.freebsd.org/changeset/base/184204

Log:
  MFC rev 183455:
  Return G_PART_PROBE_PRI_HIGH instead of G_PART_PROBE_PRI_NORM
  if the probe succeeds. This guarantees that the BSD scheme
  wins over the MBR scheme when MBR gets to probe first.
  
  Approved by:	re (kib@)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/geom/part/g_part_bsd.c

Modified: stable/7/sys/geom/part/g_part_bsd.c
==============================================================================
--- stable/7/sys/geom/part/g_part_bsd.c	Thu Oct 23 15:32:06 2008	(r184203)
+++ stable/7/sys/geom/part/g_part_bsd.c	Thu Oct 23 15:44:00 2008	(r184204)
@@ -293,7 +293,7 @@ g_part_bsd_probe(struct g_part_table *ta
 	magic2 = le32dec(buf + 132);
 	g_free(buf);
 	return ((magic1 == DISKMAGIC && magic2 == DISKMAGIC)
-	    ? G_PART_PROBE_PRI_NORM : ENXIO);
+	    ? G_PART_PROBE_PRI_HIGH : ENXIO);
 }
 
 static int



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