From owner-svn-src-all@FreeBSD.ORG  Thu Jul 22 17:35:37 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2ECF31065672;
	Thu, 22 Jul 2010 17:35:37 +0000 (UTC)
	(envelope-from brucec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1D86C8FC0C;
	Thu, 22 Jul 2010 17:35:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6MHZbm6013824;
	Thu, 22 Jul 2010 17:35:37 GMT (envelope-from brucec@svn.freebsd.org)
Received: (from brucec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6MHZaxa013822;
	Thu, 22 Jul 2010 17:35:37 GMT (envelope-from brucec@svn.freebsd.org)
Message-Id: <201007221735.o6MHZaxa013822@svn.freebsd.org>
From: Bruce Cran <brucec@FreeBSD.org>
Date: Thu, 22 Jul 2010 17:35:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210381 - head/usr.sbin/sysinstall
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jul 2010 17:35:37 -0000

Author: brucec
Date: Thu Jul 22 17:35:36 2010
New Revision: 210381
URL: http://svn.freebsd.org/changeset/base/210381

Log:
  If a size suffix isn't entered, just use the value entered. This fixes
  a bug caused by r209235 where entering a number of blocks after
  previously entering a size in MB/GB would result in the size of the
  previous partition being used.
  
  PR:	bin/148266
  Submitted by:	jpaetzel
  Approved by:	rrs (mentor)

Modified:
  head/usr.sbin/sysinstall/label.c

Modified: head/usr.sbin/sysinstall/label.c
==============================================================================
--- head/usr.sbin/sysinstall/label.c	Thu Jul 22 17:23:43 2010	(r210380)
+++ head/usr.sbin/sysinstall/label.c	Thu Jul 22 17:35:36 2010	(r210381)
@@ -1036,7 +1036,10 @@ diskLabel(Device *dev)
 #endif
 		    else
 			size = (daddr_t) dsize;
+		} else {
+			size = (daddr_t) dsize;
 		}
+
 		if (size < FS_MIN_SIZE) {
 		    msgConfirm("The minimum filesystem size is %dMB", FS_MIN_SIZE / ONE_MEG);
 		    clear_wins();