From owner-svn-src-all@FreeBSD.ORG  Wed Jan 21 08:01:45 2015
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:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 47021FBC;
 Wed, 21 Jan 2015 08:01:45 +0000 (UTC)
Received: from lauren.room52.net (lauren.room52.net [210.50.193.198])
 by mx1.freebsd.org (Postfix) with ESMTP id 0B531813;
 Wed, 21 Jan 2015 08:01:44 +0000 (UTC)
Received: from lgwl-lstewart2.corp.netflix.com
 (c110-22-60-167.eburwd6.vic.optusnet.com.au [110.22.60.167])
 by lauren.room52.net (Postfix) with ESMTPSA id 6313F7E820;
 Wed, 21 Jan 2015 18:51:47 +1100 (EST)
Message-ID: <54BF5A7B.2080601@freebsd.org>
Date: Wed, 21 Jan 2015 18:51:23 +1100
From: Lawrence Stewart <lstewart@freebsd.org>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:31.0) Gecko/20100101 Thunderbird/31.2.0
MIME-Version: 1.0
To: Will Andrews <will@freebsd.org>, src-committers@freebsd.org, 
 svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject: Re: svn commit: r275832 - head/tools/tools/nanobsd
References: <201412161759.sBGHx6ZL016021@svn.freebsd.org>
In-Reply-To: <201412161759.sBGHx6ZL016021@svn.freebsd.org>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=2.4 required=5.0 tests=DNS_FROM_AHBL_RHSBL,
 UNPARSEABLE_RELAY autolearn=no version=3.3.2
X-Spam-Level: **
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on lauren.room52.net
Cc: imp@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
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/options/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: Wed, 21 Jan 2015 08:01:45 -0000

Hi Will,

On 12/17/14 04:59, Will Andrews wrote:
> Author: will
> Date: Tue Dec 16 17:59:05 2014
> New Revision: 275832
> URL: https://svnweb.freebsd.org/changeset/base/275832
> 
> Log:
>   Make NanoBSD source-able from other scripts.
>   
>   Summary:
>   This change converts NanoBSD into a two-script bundle.
>   - defaults.sh contains all non-CLI code.  Most NanoBSD code is moved into
>     this file.
>   - nanobsd.sh now consists just of a command line interface that calls into
>     functions in defaults.sh.
>   
>   Test Plan: Run NanoBSD using a previously-working configuration.
>   
>   Reviewers: imp
>   
>   Reviewed By: imp
>   
>   Differential Revision: https://reviews.freebsd.org/D1321
> 
> Added:
>   head/tools/tools/nanobsd/defaults.sh   (contents, props changed)
> Modified:
>   head/tools/tools/nanobsd/nanobsd.sh

I think this change introduced a bug - I'm seeing nanobsd error out with
the "NANO_TOOLS directory does not exist" message.

The problem is that NANO_TOOLS is initialised to "tools/tools/nanobsd",
and you changed the test in nanobsd.sh to *not* check for
"${NANO_SRC}/${NANO_TOOLS}", which errors out except if the cwd is
${NANO_SRC}.

You tweak NANO_TOOLS appropriately in set_defaults_and_export() but it's
run after the dir test. There are a couple of ways to fix but I'll leave
it to you to decide which you prefer.

Cheers,
Lawrence