virt/incus: Use fakeroot for image build to retain rootfs ownership

skiffos · Sep 28, 2024 · 7e23644 · 7e23644
1 parent 40b7e6f
commit 7e23644
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/configs/virt/incus/extensions/Makefile b/configs/virt/incus/extensions/Makefile
@@ -1,5 +1,5 @@
 buildimage:
-	@$(SKIFF_CURRENT_CONF_DIR)/scripts/buildimage.sh
+	@FAKEROOTDONTTRYCHOWN=1 ${BUILDROOT_DIR}/host/bin/fakeroot -- $(SKIFF_CURRENT_CONF_DIR)/scripts/buildimage.sh
 run:
 	@$(SKIFF_CURRENT_CONF_DIR)/scripts/run.sh
 exec:

diff --git a/configs/virt/incus/scripts/buildimage.sh b/configs/virt/incus/scripts/buildimage.sh
@@ -1,16 +1,13 @@
 #!/bin/bash
 set -eu
 
-IMAGE_NAME=skiffos/testing
-CONTAINER=skiff
-OUTPUT_PATH="$BUILDROOT_DIR/output"
 IMAGES_PATH="$BUILDROOT_DIR/images"
 INCUS_IMAGE_PATH="${IMAGES_PATH}/incus.tar.gz"
 roottar="${IMAGES_PATH}/rootfs.tar"
 
 TMPDIR="${BUILDROOT_DIR}/incus-tmp"
-trap 'rm -rf "$TMPDIR";' EXIT
 rm -rf "$TMPDIR"
+trap 'rm -rf "$TMPDIR";' EXIT
 mkdir -p "${TMPDIR}/rootfs"
 tar -xf "$roottar" -C "$TMPDIR/rootfs"
 pushd "$TMPDIR"
@@ -25,4 +22,4 @@ echo "${INCUS_METADATA:-"${default_metadata}"}" >"${TMPDIR}/metadata.yaml"
 tar caf "${INCUS_IMAGE_PATH}" rootfs metadata.yaml
 popd
 
-echo "Incus image generated successfully as ${IMAGE_NAME}"
+echo "Incus image generated successfully at ${INCUS_IMAGE_PATH}"