From owner-svn-src-stable@FreeBSD.ORG  Wed Apr 18 05:16:03 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2E1F8106566C;
	Wed, 18 Apr 2012 05:16:03 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 18C158FC16;
	Wed, 18 Apr 2012 05:16:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3I5G23U015951;
	Wed, 18 Apr 2012 05:16:02 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3I5G2NG015949;
	Wed, 18 Apr 2012 05:16:02 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201204180516.q3I5G2NG015949@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Wed, 18 Apr 2012 05:16:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234410 - stable/9/sbin/bsdlabel
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2012 05:16:03 -0000

Author: ae
Date: Wed Apr 18 05:16:02 2012
New Revision: 234410
URL: http://svn.freebsd.org/changeset/base/234410

Log:
  MFC r234122:
    It seems that libdisk(3) incorrectly sets d_secperunit value.
    Automatically fix it like GEOM_PART_BSD does.
  
    PR:		bin/165789

Modified:
  stable/9/sbin/bsdlabel/bsdlabel.c
Directory Properties:
  stable/9/sbin/bsdlabel/   (props changed)

Modified: stable/9/sbin/bsdlabel/bsdlabel.c
==============================================================================
--- stable/9/sbin/bsdlabel/bsdlabel.c	Wed Apr 18 05:12:17 2012	(r234409)
+++ stable/9/sbin/bsdlabel/bsdlabel.c	Wed Apr 18 05:16:02 2012	(r234410)
@@ -1194,7 +1194,8 @@ checklabel(struct disklabel *lp)
 			lp->d_interleave = vl->d_interleave;
 		if (lp->d_secpercyl == 0)
 			lp->d_secpercyl = vl->d_secpercyl;
-		if (lp->d_secperunit == 0)
+		if (lp->d_secperunit == 0 ||
+		    lp->d_secperunit > vl->d_secperunit)
 			lp->d_secperunit = vl->d_secperunit;
 		if (lp->d_bbsize == 0)
 			lp->d_bbsize = vl->d_bbsize;