From owner-svn-src-all@FreeBSD.ORG  Thu Jun 18 13:56:10 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 C7DDF106564A;
	Thu, 18 Jun 2009 13:56:10 +0000 (UTC)
	(envelope-from n_hibma@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B641F8FC0A;
	Thu, 18 Jun 2009 13:56:10 +0000 (UTC)
	(envelope-from n_hibma@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 n5IDuAJO013221;
	Thu, 18 Jun 2009 13:56:10 GMT (envelope-from n_hibma@svn.freebsd.org)
Received: (from n_hibma@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5IDuAQi013219;
	Thu, 18 Jun 2009 13:56:10 GMT (envelope-from n_hibma@svn.freebsd.org)
Message-Id: <200906181356.n5IDuAQi013219@svn.freebsd.org>
From: Nick Hibma <n_hibma@FreeBSD.org>
Date: Thu, 18 Jun 2009 13:56:10 +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: r194440 - 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: Thu, 18 Jun 2009 13:56:11 -0000

Author: n_hibma
Date: Thu Jun 18 13:56:10 2009
New Revision: 194440
URL: http://svn.freebsd.org/changeset/base/194440

Log:
  - Don't hard code _.disk.full. Use the variable.
  - _.bk should be created in MAKEOBJDIRPREFIX as well
  - Remove a misplaced and unnecessary message.

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

Modified: head/tools/tools/nanobsd/nanobsd.sh
==============================================================================
--- head/tools/tools/nanobsd/nanobsd.sh	Thu Jun 18 12:04:32 2009	(r194439)
+++ head/tools/tools/nanobsd/nanobsd.sh	Thu Jun 18 13:56:10 2009	(r194440)
@@ -186,7 +186,7 @@ build_kernel ( ) (
 	unset TARGET_BIG_ENDIAN
 	env TARGET_ARCH=${NANO_ARCH} ${NANO_PMAKE} buildkernel \
 		__MAKE_CONF=${NANO_MAKE_CONF_BUILD} KERNCONF=`basename ${NANO_KERNEL}` \
-		> ${NANO_OBJ}/_.bk 2>&1
+		> ${MAKEOBJDIRPREFIX}/_.bk 2>&1
 	)
 )
 
@@ -484,7 +484,7 @@ create_i386_diskimage ( ) (
 	fi
 
 	if [ "${NANO_MD_BACKING}" = "swap" ] ; then
-		echo "Writing out _.disk.full..."
+		echo "Writing out ${NANO_IMGNAME}..."
 		dd if=/dev/${MD} of=${IMG} bs=64k
 	fi
 
@@ -839,7 +839,6 @@ prune_usr
 run_late_customize
 if $do_image ; then
 	create_${NANO_ARCH}_diskimage
-	echo "# Created NanoBSD disk image: ${NANO_DISKIMGDIR}/${NANO_IMGNAME}"
 else
 	pprint 2 "Skipping image build (as instructed)"
 fi