svn commit: r274284 - in projects/release-vmimage/release: scripts tools

[Glen Barber]

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