From 366f6a6ba55d06cd33c71e019054af8a30d1d310 Mon Sep 17 00:00:00 2001
From: Anton Midyukov <antohami@altlinux.org>
Date: Thu, 20 May 2021 20:22:07 +0700
Subject: [PATCH] build-vm, image.in: Fix parameter VM_SAVE_TAR ->
 VM_SAVE_TARBALL

The code is given in accordance with the documentation
See-also: commit 2987fa8f61339ad776f6e72c5044989c12abe87a
---
 features.in/build-vm/lib/90-build-vm.mk | 7 +++----
 image.in/Makefile                       | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/features.in/build-vm/lib/90-build-vm.mk b/features.in/build-vm/lib/90-build-vm.mk
index e9e7c72c..6676c0a1 100644
--- a/features.in/build-vm/lib/90-build-vm.mk
+++ b/features.in/build-vm/lib/90-build-vm.mk
@@ -30,11 +30,10 @@ VM_XZ_COMMAND ?= xz -T0
 RECOVERY_LINE ?= Press ENTER to start
 
 # tarball save
-#SAVE_TARBALL := convert-image/tar
-ifdef VM_SAVE_TAR
+ifdef VM_SAVE_TARBALL
 ifeq (,$(filter-out img img.xz qcow2 qcow2c vdi vmdk vhd,$(IMAGE_TYPE)))
-ifeq (,$(filter-out tar tar.gz tar.xz,$(VM_SAVE_TAR)))
-SAVE_TARBALL := convert-image/$(VM_SAVE_TAR)
+ifeq (,$(filter-out tar tar.gz tar.xz,$(VM_SAVE_TARBALL)))
+SAVE_TARBALL := convert-image/$(VM_SAVE_TARBALL)
 endif
 endif
 endif
diff --git a/image.in/Makefile b/image.in/Makefile
index e7bd7006..9c92d4af 100644
--- a/image.in/Makefile
+++ b/image.in/Makefile
@@ -95,8 +95,8 @@ postprocess: | $(addprefix postprocess-,$(sort $(POSTPROCESS_TARGETS)))
 		echo "** error: $(IMAGE_OUTPATH) missing" >&2; \
 		exit 1; \
 	fi; \
-	if [ -n "$(VM_SAVE_TAR)" ]; then \
-		echo "** tarball saved: $(IMAGE_OUTPATH)/$(IMAGE_OUTNAME).$(VM_SAVE_TAR)" >&2; \
+	if [ -n "$(VM_SAVE_TARBALL)" ]; then \
+		echo "** tarball saved: $(IMAGE_OUTPATH)/$(IMAGE_OUTNAME).$(VM_SAVE_TARBALL)" >&2; \
 	fi; \
 	echo "** image: $(IMAGE_OUTPATH) [$$OUTSIZE]" >&2 && \
 	echo "IMAGE_OUTPATH = $(IMAGE_OUTPATH)" && \