aboutsummaryrefslogtreecommitdiff
path: root/release/scripts
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2015-02-10 12:04:38 +0000
committerGlen Barber <gjb@FreeBSD.org>2015-02-10 12:04:38 +0000
commite90de53410ab3ee96ee4b34c48ebdfd345053a87 (patch)
treeffd68a9fb148a70ef8c56b6ba14e4634bd3fb422 /release/scripts
parentaecb7ac16f7cce96a54e89aa8a148263594da42e (diff)
downloadsrc-e90de53410ab3ee96ee4b34c48ebdfd345053a87.tar.gz
src-e90de53410ab3ee96ee4b34c48ebdfd345053a87.zip
In scripts/mk-vmimage.sh, prevent incorrect usage() by
defaulting VMCONFIG to /dev/null, and additionally ensuring VMCONFIG is not a character device before it is sourced. While here, be sure to exit if usage() is called. This should effectively be no-op, but the usage() output was discovered while investigating a larger issue. MFC after: 1 week X-MFC-with: r277458, r277536, r277606, r277609, r277836, r278118, r278119, r278206 Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=278502
Diffstat (limited to 'release/scripts')
-rwxr-xr-xrelease/scripts/mk-vmimage.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/release/scripts/mk-vmimage.sh b/release/scripts/mk-vmimage.sh
index b6122a5de01f..b5fb350d647d 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