From 144d107fcd0859d2133a35d26de0559bb3b7c957 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 8 Nov 2014 12:47:21 +0000
Subject: [PATCH] Move usage() from vmimage.subr to mk-vmimage.sh, in case
 vmimage.subr has not been sourced.

Sponsored by:	The FreeBSD Foundation
---
 release/scripts/mk-vmimage.sh | 6 ++++++
 release/tools/vmimage.subr    | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/release/scripts/mk-vmimage.sh b/release/scripts/mk-vmimage.sh
index 27c48b72b915..0dd330fa98d9 100755
--- a/release/scripts/mk-vmimage.sh
+++ b/release/scripts/mk-vmimage.sh
@@ -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
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index 7e54a7f3311c..62273a528f12 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -35,12 +35,6 @@ write_partition_layout() {
 	return 0
 }
 
-usage() {
-	echo "${0} usage:"
-	echo "${@}"
-	return 1
-}
-
 err() {
 	printf "${@}\n"
 	cleanup