diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2015-02-10 12:04:38 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2015-02-10 12:04:38 +0000 |
| commit | e90de53410ab3ee96ee4b34c48ebdfd345053a87 (patch) | |
| tree | ffd68a9fb148a70ef8c56b6ba14e4634bd3fb422 /release/scripts | |
| parent | aecb7ac16f7cce96a54e89aa8a148263594da42e (diff) | |
| download | src-test-e90de53410ab3ee96ee4b34c48ebdfd345053a87.tar.gz src-test-e90de53410ab3ee96ee4b34c48ebdfd345053a87.zip | |
Notes
Diffstat (limited to 'release/scripts')
| -rwxr-xr-x | release/scripts/mk-vmimage.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/release/scripts/mk-vmimage.sh b/release/scripts/mk-vmimage.sh index b6122a5de01f2..b5fb350d647d5 100755 --- a/release/scripts/mk-vmimage.sh +++ b/release/scripts/mk-vmimage.sh @@ -40,6 +40,7 @@ usage() { main() { local arg + VMCONFIG="/dev/null" while getopts "C:c:d:f:i:o:s:S:" arg; do case "${arg}" in C) @@ -76,10 +77,9 @@ main() { -z "${WORLDDIR}" -o \ -z "${DESTDIR}" -o \ -z "${VMSIZE}" -o \ - -z "${VMIMAGE}" -o \ - -z "${VMCONFIG}" ]; + -z "${VMIMAGE}" ]; then - usage + usage || exit 0 fi if [ -z "${VMBUILDCONF}" ] || [ ! -e "${VMBUILDCONF}" ]; then @@ -89,7 +89,7 @@ main() { . "${VMBUILDCONF}" - if [ ! -z "${VMCONFIG}" ] && [ -e "${VMCONFIG}" ]; then + if [ ! -z "${VMCONFIG}" ] && [ ! -c "${VMCONFIG}" ]; then . "${VMCONFIG}" fi |