diff options
| author | gjb <gjb@FreeBSD.org> | 2014-10-02 18:23:53 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2014-10-02 18:23:53 +0000 |
| commit | da5a9f35d4d6780ed1becaea2ee7b00ac00bd675 (patch) | |
| tree | be42a20ca2da06ff24b16c91af640a8cbbd921e1 /release | |
| parent | c932f99a7aec16e93d90981e5669169a8eaa1ff8 (diff) | |
| download | FreeBSD-src-da5a9f35d4d6780ed1becaea2ee7b00ac00bd675.zip FreeBSD-src-da5a9f35d4d6780ed1becaea2ee7b00ac00bd675.tar.gz | |
If the vm-base target fails, prevent the vm-image target
from being run since it cannot possibly succeed.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release')
| -rwxr-xr-x | release/amd64/mk-vmimage.sh | 11 | ||||
| -rwxr-xr-x | release/i386/mk-vmimage.sh | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/release/amd64/mk-vmimage.sh b/release/amd64/mk-vmimage.sh index 30163e7..e0bc976 100755 --- a/release/amd64/mk-vmimage.sh +++ b/release/amd64/mk-vmimage.sh @@ -63,6 +63,17 @@ panic() { if [ ! -z "${mddev}" ]; then mdconfig -d -u ${mddev} fi + case ${cmd} in + vm-base) + # If the vm-base target fails, the vm-image target + # cannot possibly succeed. Touch the .TARGET file + # so it is not attempted. + touch vm-image + ;; + *) + # FALLTHROUGH + ;; + esac # Do not allow one failure case to chain through any remaining image # builds. return 1 diff --git a/release/i386/mk-vmimage.sh b/release/i386/mk-vmimage.sh index 30163e7..e0bc976 100755 --- a/release/i386/mk-vmimage.sh +++ b/release/i386/mk-vmimage.sh @@ -63,6 +63,17 @@ panic() { if [ ! -z "${mddev}" ]; then mdconfig -d -u ${mddev} fi + case ${cmd} in + vm-base) + # If the vm-base target fails, the vm-image target + # cannot possibly succeed. Touch the .TARGET file + # so it is not attempted. + touch vm-image + ;; + *) + # FALLTHROUGH + ;; + esac # Do not allow one failure case to chain through any remaining image # builds. return 1 |
