diff options
| -rwxr-xr-x | tools/yardstick-img-modify | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/tools/yardstick-img-modify b/tools/yardstick-img-modify index ee9a45780..33065627f 100755 --- a/tools/yardstick-img-modify +++ b/tools/yardstick-img-modify @@ -25,6 +25,7 @@ # set -e +set -x die() { echo "error: $1" >&2 @@ -117,13 +118,34 @@ cleanup() { rm -rf $mountdir } -set -x +exitcode="" +error_trap() +{ + local rc=$? + + set +e + + if [ -z "$exitcode" ]; then + exitcode=$rc + fi + + cleanup + + echo "Image build failed with $exitcode" + + exit $exitcode +} main() { cleanup + + trap "error_trap" EXIT SIGTERM + download setup modify + + trap - EXIT SIGTERM cleanup echo "the modified image is found here: $imgfile" |