From 66fa914993d45d11ae64531157bc6df7705da862 Mon Sep 17 00:00:00 2001 From: "Jason N." <33561705+JasonN3@users.noreply.github.com> Date: Mon, 4 Mar 2024 16:37:51 -0500 Subject: [PATCH] ensure flatpak is installed --- Makefile | 6 +++++- entrypoint.sh | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 17318ce..d77547d 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,10 @@ ifeq ($(WEB_UI),true) _LORAX_ARGS += -i anaconda-webui endif +ifneq ($(FLATPAK_REMOTE_REFS),) +_LORAX_ARGS += -i flatpak-libs +endif + # Step 7: Buid end ISO ## Default action build/deploy.iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.txt @@ -105,7 +109,7 @@ clean: rm -f $(_BASE_DIR)/*.log || true install-deps: - dnf install -y lorax xorriso skopeo + dnf install -y lorax xorriso skopeo flatpak .PHONY: clean install-deps diff --git a/entrypoint.sh b/entrypoint.sh index 5005737..4e72dc6 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -2,6 +2,9 @@ set -ex +# Create /dev/loop0 if it doesn't already exist. `losetup` has an issue creating it during the first run +mknod -m 0660 /dev/loop0 b 7 0 2>/dev/null || true + for entry in $@ do export $entry