From owner-svn-src-projects@FreeBSD.ORG  Sat Nov  8 12:47:23 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 15CC43F5;
 Sat,  8 Nov 2014 12:47:23 +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 02FB8C32;
 Sat,  8 Nov 2014 12:47:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA8ClMtJ097725;
 Sat, 8 Nov 2014 12:47:22 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA8ClMSs097722;
 Sat, 8 Nov 2014 12:47:22 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201411081247.sA8ClMSs097722@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: Sat, 8 Nov 2014 12:47:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r274284 - in projects/release-vmimage/release: scripts
 tools
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: Sat, 08 Nov 2014 12:47:23 -0000

Author: gjb
Date: Sat Nov  8 12:47:21 2014
New Revision: 274284
URL: https://svnweb.freebsd.org/changeset/base/274284

Log:
  Move usage() from vmimage.subr to mk-vmimage.sh,
  in case vmimage.subr has not been sourced.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-vmimage/release/scripts/mk-vmimage.sh
  projects/release-vmimage/release/tools/vmimage.subr

Modified: projects/release-vmimage/release/scripts/mk-vmimage.sh
==============================================================================
--- projects/release-vmimage/release/scripts/mk-vmimage.sh	Sat Nov  8 12:45:35 2014	(r274283)
+++ projects/release-vmimage/release/scripts/mk-vmimage.sh	Sat Nov  8 12:47:21 2014	(r274284)
@@ -32,6 +32,12 @@
 # $FreeBSD$
 #
 
+usage() {
+	echo "${0} usage:"
+	echo "${@}"
+	return 1
+}
+
 main() {
 	local arg
 	while getopts "C:c:d:f:i:o:s:S:" arg; do

Modified: projects/release-vmimage/release/tools/vmimage.subr
==============================================================================
--- projects/release-vmimage/release/tools/vmimage.subr	Sat Nov  8 12:45:35 2014	(r274283)
+++ projects/release-vmimage/release/tools/vmimage.subr	Sat Nov  8 12:47:21 2014	(r274284)
@@ -35,12 +35,6 @@ write_partition_layout() {
 	return 0
 }
 
-usage() {
-	echo "${0} usage:"
-	echo "${@}"
-	return 1
-}
-
 err() {
 	printf "${@}\n"
 	cleanup