=== modified file 'functions/build-dir-from-image' --- functions/build-dir-from-image 2017-12-08 08:00:17 +0000 +++ functions/build-dir-from-image 2017-12-06 19:34:01 +0000 @@ -13,16 +13,16 @@ vars[fstab]+="$src:A ${vars[build_dir]:A} $fstype $mount_opts 0 0 " -#while grep -q "^[^ ]\\+ ${vars[build_dir]:A} " /proc/mounts; do -# umount ${vars[build_dir]:A} || die "Failed to umount ${(qqq)vars[build_dir]}" -#done -# -#local remove -#[[ -e $vars[build_dir] ]] && remove+=( $vars[build_dir]/*(DN) ) -#if (($#remove)); then -# rm -rf $remove \ -# || die "Failed to clean build directory ${(qqq)vars[build_dir]}" -#fi +while grep -q "^[^ ]\\+ ${vars[build_dir]:A} " /proc/mounts; do + umount ${vars[build_dir]:A} || die "Failed to umount ${(qqq)vars[build_dir]}" +done + +local remove +[[ -e $vars[build_dir] ]] && remove+=( $vars[build_dir]/*(DN) ) +if (($#remove)); then + rm -rf $remove \ + || die "Failed to clean build directory ${(qqq)vars[build_dir]}" +fi mkdir -p $vars[build_dir] \ || die "Failed to create build directory ${(qqq)vars[build_dir]}"