Use correct path for system tar2fs

tar2fs comes from m-p, not from mkimage. Also, we should use $TOPDIR from shell, not $(TOPDIR) from make, when calling it. Note: this is a security fix for environments relying on packaged mkimage-profiles with sudo enabled for the builder user. Fixes: f293239d

Use correct path for system tar2fs
98a9c1f3 · Ivan A. Melnikov · Michael Shigorin · 4cc5067d · 98a9c1f3
Commit 98a9c1f3 authored Dec 10, 2018 by Ivan A. Melnikov Committed by Michael Shigorin Dec 25, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

90-build-vm.mk features.in/build-vm/lib/90-build-vm.mk +4 -4

No files found.
--- a/features.in/build-vm/lib/90-build-vm.mk
+++ b/features.in/build-vm/lib/90-build-vm.mk
@@ -23,11 +23,11 @@ check-sudo:
 	fi

 prepare-image: check-sudo
-	@if [ -x $(MKIMAGE_PREFIX)/bin/tar2fs ]; then \
-		TOPDIR=$(MKIMAGE_PREFIX); \
+	@if [ -x /usr/share/mkimage-profiles/bin/tar2fs ]; then \
+		TOPDIR=/usr/share/mkimage-profiles; \
 	fi; \
-	if ! sudo $(TOPDIR)/bin/tar2fs \
-		"$(VM_TARBALL)" "$(VM_RAWDISK)"  $(VM_SIZE) $(VM_FSTYPE); then \
+	if ! sudo $$TOPDIR/bin/tar2fs \
+		"$(VM_TARBALL)" "$(VM_RAWDISK)" $(VM_SIZE) $(VM_FSTYPE); then \
 		echo "** error: sudo tar2fs failed, see build log" >&2; \
 		exit 1; \
 	fi