From 6eaa8fc812ef8feeac5ec2f76c9fdc110b2b5c75 Mon Sep 17 00:00:00 2001 From: Alex Yang Date: Sun, 16 Apr 2017 02:18:38 +0800 Subject: The image file is deleted mistakenly There's an mistake in patch 33327. See https://gerrit.opnfv.org/gerrit/#/c/33327/ The cleanup function was called twice, so the image file was deleted. Change-Id: I5fe6a90b46739d1c6d8b66365d2c8e55350cde00 Signed-off-by: Alex Yang --- tools/daisy-img-modify.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/daisy-img-modify.sh b/tools/daisy-img-modify.sh index f172ceec..90910a14 100755 --- a/tools/daisy-img-modify.sh +++ b/tools/daisy-img-modify.sh @@ -211,9 +211,6 @@ cleanup() { kpartx -dv $raw_imgfile || eliminate fi rm -f $raw_imgfile - if [ -f $imgfile ]; then - rm -rf $imgfile - fi rm -rf $mountdir } @@ -239,6 +236,9 @@ error_trap() main() { cleanup + if [ -f $imgfile ]; then + rm -rf $imgfile + fi trap "error_trap" EXIT SIGTERM -- cgit 1.2.3-korg