From owner-svn-src-projects@FreeBSD.ORG  Thu Oct  9 03:50:39 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@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 7D1533E7;
 Thu,  9 Oct 2014 03:50: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 4F4B5AD7;
 Thu,  9 Oct 2014 03:50:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s993odLf006644;
 Thu, 9 Oct 2014 03:50:39 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s993ocfg006642;
 Thu, 9 Oct 2014 03:50:38 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201410090350.s993ocfg006642@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 9 Oct 2014 03:50:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r272794 - in projects/release-vmimage/release: amd64 i386
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Oct 2014 03:50:39 -0000

Author: gjb
Date: Thu Oct  9 03:50:38 2014
New Revision: 272794
URL: https://svnweb.freebsd.org/changeset/base/272794

Log:
  Allow mk-vmimage.sh to accept a configuration file as
  an argument to '-c'.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-vmimage/release/amd64/mk-vmimage.sh
  projects/release-vmimage/release/i386/mk-vmimage.sh

Modified: projects/release-vmimage/release/amd64/mk-vmimage.sh
==============================================================================
--- projects/release-vmimage/release/amd64/mk-vmimage.sh	Thu Oct  9 03:29:52 2014	(r272793)
+++ projects/release-vmimage/release/amd64/mk-vmimage.sh	Thu Oct  9 03:50:38 2014	(r272794)
@@ -188,9 +188,28 @@ vm_create_vmdisk() {
 }
 
 main() {
+	vm_config=
+	while getopts "c:" arg; do
+		case ${arg} in
+			c)
+				vm_config="${OPTARG}"
+				;;
+			*)
+				;;
+		esac
+	done
+	shift $(( ${OPTIND} - 1 ))
+
 	cmd="${1}"
 	shift 1
 
+	if [ ! -z "${vm_config}" ]; then
+		if [ ! -e "${vm_config}" ]; then
+			panic "Configuration file ${vm_config} not found."
+		fi
+		. ${vm_config}
+	fi
+
 	case ${cmd} in
 		vm-base)
 			eval vm_create_baseimage "$@" || return 0

Modified: projects/release-vmimage/release/i386/mk-vmimage.sh
==============================================================================
--- projects/release-vmimage/release/i386/mk-vmimage.sh	Thu Oct  9 03:29:52 2014	(r272793)
+++ projects/release-vmimage/release/i386/mk-vmimage.sh	Thu Oct  9 03:50:38 2014	(r272794)
@@ -188,9 +188,28 @@ vm_create_vmdisk() {
 }
 
 main() {
+	vm_config=
+	while getopts "c:" arg; do
+		case ${arg} in
+			c)
+				vm_config="${OPTARG}"
+				;;
+			*)
+				;;
+		esac
+	done
+	shift $(( ${OPTIND} - 1 ))
+
 	cmd="${1}"
 	shift 1
 
+	if [ ! -z "${vm_config}" ]; then
+		if [ ! -e "${vm_config}" ]; then
+			panic "Configuration file ${vm_config} not found."
+		fi
+		. ${vm_config}
+	fi
+
 	case ${cmd} in
 		vm-base)
 			eval vm_create_baseimage "$@" || return 0