From owner-svn-src-all@FreeBSD.ORG  Tue Jun 16 12:33:39 2009
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 54108106564A;
	Tue, 16 Jun 2009 12:33:39 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 422368FC1C;
	Tue, 16 Jun 2009 12:33:39 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5GCXd0h027458;
	Tue, 16 Jun 2009 12:33:39 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5GCXdLK027457;
	Tue, 16 Jun 2009 12:33:39 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200906161233.n5GCXdLK027457@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Tue, 16 Jun 2009 12:33:39 +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: r194288 - head/tools/tools/nanobsd
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: Tue, 16 Jun 2009 12:33:39 -0000

Author: edwin
Date: Tue Jun 16 12:33:38 2009
New Revision: 194288
URL: http://svn.freebsd.org/changeset/base/194288

Log:
  Fix NanoBSD when the data partition size is defined as a negative
  number.
  
  	It is possible to ask nanobsd.sh to create a 'data' partition,
  	separate from the system or configuration partitions, and
  	furthermore, by specifying a negative value for its size
  	to request that it use all space unused by those partitions
  	for its own size.
  
  	Because the two lines of code that calculate how much space
  	is available for this data partition are written in perl-like
  	syntax, the awk code that does the processing performs the
  	calculation incorrectly.
  	[note - this was already fixed by r174936]
  
  	Furthermore, a comparison later down fails to newfs the
  	partition when the size is negative.
  
  PR:		misc/127759
  Submitted by:	Cyrus Rahman <crahman@gmail.com>
  MFC after:	1 week

Modified:
  head/tools/tools/nanobsd/nanobsd.sh

Modified: head/tools/tools/nanobsd/nanobsd.sh
==============================================================================
--- head/tools/tools/nanobsd/nanobsd.sh	Tue Jun 16 12:14:57 2009	(r194287)
+++ head/tools/tools/nanobsd/nanobsd.sh	Tue Jun 16 12:33:38 2009	(r194288)
@@ -474,7 +474,7 @@ create_i386_diskimage ( ) (
 	# XXX: fill from where ?
 
 	# Create Data slice, if any.
-	if [ $NANO_DATASIZE -gt 0 ] ; then
+	if [ $NANO_DATASIZE -ne 0 ] ; then
 		newfs ${NANO_NEWFS} /dev/${MD}s4
 		# XXX: fill from where ?
 	fi