From owner-svn-src-all@freebsd.org  Mon Nov 28 21:29:02 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9CE9DC5A296;
 Mon, 28 Nov 2016 21:29:02 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6C9D41910;
 Mon, 28 Nov 2016 21:29:02 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uASLT1Xx078699;
 Mon, 28 Nov 2016 21:29:01 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uASLT1G7078698;
 Mon, 28 Nov 2016 21:29:01 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201611282129.uASLT1G7078698@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 28 Nov 2016 21:29:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r309271 - head/tools/tools/nanobsd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Nov 2016 21:29:02 -0000

Author: imp
Date: Mon Nov 28 21:29:01 2016
New Revision: 309271
URL: https://svnweb.freebsd.org/changeset/base/309271

Log:
  Trying to autodetect legacy setups lead to problems when people
  overrode the disk image creation routine. For now, just always bring
  in the legecy defines / routines.

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

Modified: head/tools/tools/nanobsd/nanobsd.sh
==============================================================================
--- head/tools/tools/nanobsd/nanobsd.sh	Mon Nov 28 21:16:03 2016	(r309270)
+++ head/tools/tools/nanobsd/nanobsd.sh	Mon Nov 28 21:29:01 2016	(r309271)
@@ -44,9 +44,9 @@ do_installworld=true
 do_image=true
 do_copyout_partition=true
 do_native_xtools=false
-# Don't do the legacy build unless we detect 'old' variables being
-# set.
-do_legacy=false
+
+# Pull in legacy stuff for now automatically
+. "${topdir}/legacy.sh"
 
 set +e
 args=`getopt BKXWbc:fhiknqvw $*`
@@ -134,15 +134,6 @@ if [ $# -gt 0 ] ; then
 	usage
 fi
 
-if [ -n "$NANO_HEADS" -o -n "$NANO_SECTS" ]; then
-	do_legacy=true
-fi
-
-# If this uses the old, legacy image system, pull that in as well
-if $do_legacy ; then
-	. "${topdir}/legacy.sh"
-fi
-
 #######################################################################
 # And then it is as simple as that...