From 02f4d0a380b25e75291da64bbdf0b29bd5be5fb0 Mon Sep 17 00:00:00 2001 From: Mirza Krak Date: Fri, 28 Dec 2018 13:15:24 +0100 Subject: [PATCH] do clean-up of intermediate files at the end Outside any specific stages, mostly because stages could potentially share files. Changelog: None Signed-off-by: Mirza Krak --- mender-convert | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/mender-convert b/mender-convert index 7504fd1..2cca1e8 100755 --- a/mender-convert +++ b/mender-convert @@ -409,10 +409,6 @@ do_make_sdimg_raspberrypi3() { ((step++)) set_fstab $device_type - [[ $keep != "-k" ]] && { rm -f $output_dir/boot.vfat\ - $output_dir/cmdline.txt $output_dir/config.txt\ - $output_dir/rootfs.img; } - return 0 } @@ -460,9 +456,6 @@ do_make_sdimg_qemux86_64() { ((step++)) set_fstab $device_type - [[ $keep != "-k" ]] && { rm -f $output_dir/boot.vfat\ - $output_dir/syslinux.cfg $output_dir/rootfs.img; } - return 0 } @@ -885,4 +878,8 @@ case "$1" in ;; esac +[[ $keep != "-k" ]] && { rm -f $output_dir/boot.vfat \ + $output_dir/cmdline.txt $output_dir/config.txt \ + $output_dir/syslinux.cfg $output_dir/rootfs.img; } + exit 0