From owner-svn-src-all@FreeBSD.ORG  Mon May 12 19:11:39 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EF2AC659;
 Mon, 12 May 2014 19:11:39 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 DCA182514;
 Mon, 12 May 2014 19:11:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4CJBd9H005344;
 Mon, 12 May 2014 19:11:39 GMT (envelope-from thomas@svn.freebsd.org)
Received: (from thomas@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4CJBdqQ005343;
 Mon, 12 May 2014 19:11:39 GMT (envelope-from thomas@svn.freebsd.org)
Message-Id: <201405121911.s4CJBdqQ005343@svn.freebsd.org>
From: Thomas Quinot <thomas@FreeBSD.org>
Date: Mon, 12 May 2014 19:11:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r265926 - 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.18
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: Mon, 12 May 2014 19:11:40 -0000

Author: thomas
Date: Mon May 12 19:11:39 2014
New Revision: 265926
URL: http://svnweb.freebsd.org/changeset/base/265926

Log:
  (NANO_CONFIG): New variable containing path of config file, so that
  the configuration can reference additional files relative to its own
  location.
  
  (NANO_MODULES): If set to "default", install all built modules.
  
  Reviewed by:	imp
  MFC after:	1 week

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

Modified: head/tools/tools/nanobsd/nanobsd.sh
==============================================================================
--- head/tools/tools/nanobsd/nanobsd.sh	Mon May 12 18:45:56 2014	(r265925)
+++ head/tools/tools/nanobsd/nanobsd.sh	Mon May 12 19:11:39 2014	(r265926)
@@ -79,7 +79,8 @@ CONF_WORLD=' '
 # Kernel config file to use
 NANO_KERNEL=GENERIC
 
-# Kernel modules to build; default is none
+# Kernel modules to install. If empty, no modules are installed.
+# Use "default" to install all built modules.
 NANO_MODULES=
 
 # Customize commands.
@@ -321,13 +322,19 @@ install_kernel ( ) (
 		kernconf=${NANO_KERNEL}
 	fi
 
+	# Install all built modules if NANO_MODULES=default,
+	# else install only listed modules (none if NANO_MODULES is empty).
+	if [ "${NANO_MODULES}" != "default" ]; then
+		modules_override_arg="MODULES_OVERRIDE='${NANO_MODULES}'"
+	fi
+
 	cd ${NANO_SRC}
 	eval "TARGET_ARCH=${NANO_ARCH} ${NANO_MAKE} installkernel \
 		DESTDIR='${NANO_WORLDDIR}' \
 		SRCCONF='${SRCCONF}' \
 		__MAKE_CONF='${NANO_MAKE_CONF_INSTALL}' \
 		${kernconfdir_arg} KERNCONF=${kernconf} \
-		MODULES_OVERRIDE='${NANO_MODULES}'"
+		${modules_override_arg}"
 	) > ${NANO_OBJ}/_.ik 2>&1
 )
 
@@ -925,6 +932,10 @@ do
 		shift
 		;;
 	-c)
+		# Make config file path available to the config file
+		# itself so that it can access additional files relative
+		# to its own location.
+		NANO_CONFIG=$2
 		. "$2"
 		shift
 		shift