Date: Thu, 9 Oct 2014 03:50:38 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r272794 - in projects/release-vmimage/release: amd64 i386 Message-ID: <201410090350.s993ocfg006642@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410090350.s993ocfg006642>