From 0416e83ac1666cd2a4556cf6776d2b7d3b4de47a Mon Sep 17 00:00:00 2001 From: Danathar Date: Fri, 11 Sep 2026 12:03:01 -0400 Subject: [PATCH 1/3] fix: repoint live installer at tuna-os bootc-installer Use the active tuna-os/bootc-installer release as the sole source for the pinned Flatpak bundle and remove the archived fallback repository. Assisted-by: GPT-5 via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Danathar --- Justfile | 5 ++--- README.md | 5 ++--- docs/skills/local-testing.md | 22 +++++++++++----------- iso/live/src/install-flatpaks.sh | 11 +++-------- 4 files changed, 18 insertions(+), 25 deletions(-) diff --git a/Justfile b/Justfile index 6706129f..249cd906 100644 --- a/Justfile +++ b/Justfile @@ -338,9 +338,8 @@ generate-bootable-image stream="testing": sync echo "Bootable disk ready: $disk" -# Build a single-architecture UEFI live ISO. This first slice proves the -# Utah live boot path; installer payload integration is intentionally the next -# ISO milestone. +# Build a single-architecture UEFI live ISO, including the offline installer +# and Flatpak payload composed by iso/live/src/install-flatpaks.sh. iso stream="testing" debug="0": #!/usr/bin/env bash set -euo pipefail diff --git a/README.md b/README.md index 1ffae678..2a5acfd0 100644 --- a/README.md +++ b/README.md @@ -66,9 +66,8 @@ verify step asserts *that file*, so the two cannot disagree. This is the honest list, and it is why the label above says pre-alpha. -- **Nothing is published.** No image, no ISO artifact, no installer. A live - ISO builds locally (`just iso`); installer payload integration is the next - ISO milestone. +- **Nothing is published.** No image or ISO artifact is published; a live ISO + with its installer payload builds locally (`just iso`). - **The NVIDIA and gaming flavors are unproven.** The OGC kernel compiles with `sched_ext` and `binderfs` genuinely enabled, and the NVIDIA open module compiles for the base kernel. The module against the OGC kernel, the driver diff --git a/docs/skills/local-testing.md b/docs/skills/local-testing.md index 67755c90..0e083508 100644 --- a/docs/skills/local-testing.md +++ b/docs/skills/local-testing.md @@ -106,12 +106,14 @@ The local OCI ref is not available from the guest's localhost registry, so unified-storage service is skipped instead of retrying its registry repull forever. Published images omit that argument and keep the service enabled. -## Live ISO (initial bring-up) +## Live ISO -The first ISO slice reuses Utah's own kernel, dracut-live, and GNOME image. -`just iso` builds a single-architecture UEFI live ISO; this first slice proves -the Utah live boot path, and installer payload integration is intentionally -the next ISO milestone (comment above `iso` in `Justfile`): +The ISO reuses Utah's own kernel, dracut-live, and GNOME image. `just iso` +builds a single-architecture UEFI live ISO and runs +`iso/live/src/install-flatpaks.sh` while composing it. That script fetches the +version-pinned bootc-installer Flatpak bundle and the declared Flathub apps, so +installer-source changes should be covered by `just check` plus a full +`just iso testing` build when the build environment has network access: ```bash just iso testing @@ -120,12 +122,10 @@ just iso testing 1 # optional live-session SSH diagnostics (debug=1) ``` The result is `output/utah-live.iso`, assembled with systemd-boot, a -`UTAH_LIVE` dmsquash-live root, and a serial `UTAH_LIVE_READY` marker. It is -intended to prove live desktop boot first; bootc-installer/offline payload -integration is the next ISO milestone. `just boot-iso` boots it with -QEMU-for-Docker and exposes the noVNC console at the printed URL (comment -above `boot-iso` in `Justfile`), with TPM, UEFI, and `-snapshot` so nothing -persists. +`UTAH_LIVE` dmsquash-live root, and a serial `UTAH_LIVE_READY` marker. +`just boot-iso` boots it with QEMU-for-Docker and exposes the noVNC console at +the printed URL (comment above `boot-iso` in `Justfile`), with TPM, UEFI, and +`-snapshot` so nothing persists. ## Verification diff --git a/iso/live/src/install-flatpaks.sh b/iso/live/src/install-flatpaks.sh index 01225b0a..3c81bee0 100644 --- a/iso/live/src/install-flatpaks.sh +++ b/iso/live/src/install-flatpaks.sh @@ -6,8 +6,7 @@ set -euo pipefail FLATPAK_CACHE=/var/cache/flatpak-dl INSTALLER_APP_ID=org.bootcinstaller.Installer -INSTALLER_REPO=projectbluefin/bootc-installer -FALLBACK_REPO=tuna-os/tuna-installer +INSTALLER_REPO=tuna-os/bootc-installer BUNDLE=org.bootcinstaller.Installer.flatpak # Pin the installer release so ISO composition is reproducible rather than # resolving a mutable `latest` during the build. Override with @@ -27,13 +26,9 @@ flatpak remote-add --system --if-not-exists flathub https://dl.flathub.org/repo/ # A bundle import needs a temporary local remote in an OCI build: direct # --bundle installs omit the deploy/active ref without flatpak-system-helper. -if ! curl --retry 3 --fail --location \ +curl --retry 3 --fail --location \ "https://github.com/${INSTALLER_REPO}/releases/download/${INSTALLER_VERSION}/${BUNDLE}" \ - -o /tmp/bootc-installer.flatpak; then - curl --retry 3 --fail --location \ - "https://github.com/${FALLBACK_REPO}/releases/download/${INSTALLER_VERSION}/${BUNDLE}" \ - -o /tmp/bootc-installer.flatpak -fi + -o /tmp/bootc-installer.flatpak local_repo=/tmp/bootc-installer-repo ostree init --repo="${local_repo}" --mode=archive-z2 flatpak build-import-bundle "${local_repo}" /tmp/bootc-installer.flatpak From f4964ec54e88b73d20227428f0acc811194f583e Mon Sep 17 00:00:00 2001 From: Danathar Date: Sat, 12 Sep 2026 00:10:46 +0000 Subject: [PATCH 2/3] fix: keep projectbluefin/bootc-installer, defer fallback removal to #48 Review on #65 found that tuna-os/bootc-installer does not publish the pinned v3.0.16 release (it tops out at v3.0.14 on semver tags), so repointing INSTALLER_REPO there while keeping the v3.0.16 pin breaks `just iso`: the curl 404s and, with the fallback removed, nothing catches it under set -euo pipefail. Verified v3.0.16 is only served from projectbluefin/bootc-installer. #48 already carries the fallback removal plus a sha256sum digest pin verified against the real published asset, so this PR reduces to its docs/Justfile clarifications and keeps INSTALLER_REPO pointed at projectbluefin/bootc-installer with a comment recording why. Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_01LNgJ8VMdoqzGequbxsP2Kc --- iso/live/src/install-flatpaks.sh | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/iso/live/src/install-flatpaks.sh b/iso/live/src/install-flatpaks.sh index 3c81bee0..8c70e3c8 100644 --- a/iso/live/src/install-flatpaks.sh +++ b/iso/live/src/install-flatpaks.sh @@ -6,7 +6,13 @@ set -euo pipefail FLATPAK_CACHE=/var/cache/flatpak-dl INSTALLER_APP_ID=org.bootcinstaller.Installer -INSTALLER_REPO=tuna-os/bootc-installer +# projectbluefin/bootc-installer and tuna-os/bootc-installer share tag history +# through v3.0.9 (evidently a fork/mirror pair), but only +# projectbluefin/bootc-installer currently publishes the pinned release below +# (tuna-os/bootc-installer tops out at v3.0.14 on semver tags). See #50 for +# the open question of which org is canonical going forward. +INSTALLER_REPO=projectbluefin/bootc-installer +FALLBACK_REPO=tuna-os/tuna-installer BUNDLE=org.bootcinstaller.Installer.flatpak # Pin the installer release so ISO composition is reproducible rather than # resolving a mutable `latest` during the build. Override with @@ -26,9 +32,13 @@ flatpak remote-add --system --if-not-exists flathub https://dl.flathub.org/repo/ # A bundle import needs a temporary local remote in an OCI build: direct # --bundle installs omit the deploy/active ref without flatpak-system-helper. -curl --retry 3 --fail --location \ +if ! curl --retry 3 --fail --location \ "https://github.com/${INSTALLER_REPO}/releases/download/${INSTALLER_VERSION}/${BUNDLE}" \ - -o /tmp/bootc-installer.flatpak + -o /tmp/bootc-installer.flatpak; then + curl --retry 3 --fail --location \ + "https://github.com/${FALLBACK_REPO}/releases/download/${INSTALLER_VERSION}/${BUNDLE}" \ + -o /tmp/bootc-installer.flatpak +fi local_repo=/tmp/bootc-installer-repo ostree init --repo="${local_repo}" --mode=archive-z2 flatpak build-import-bundle "${local_repo}" /tmp/bootc-installer.flatpak From e05e20556e6e24c44543ac0f7d4efe849f6889b1 Mon Sep 17 00:00:00 2001 From: Danathar Date: Mon, 14 Sep 2026 14:18:48 +0000 Subject: [PATCH 3/3] docs: record why the installer repoint is a re-pin, not a missing artifact Review on #65 established that repointing at tuna-os/bootc-installer while keeping the v3.0.16 pin breaks the ISO build -- that tag exists only in projectbluefin/bootc-installer, and `curl --fail` aborts the script under set -euo pipefail. f4964ec reverted the repoint in response. The comment that commit left behind is accurate but incomplete, and the missing half is the part that matters for whoever resolves #50: it reads as "tuna-os does not publish this", when in fact tuna-os publishes the same org.bootcinstaller.Installer.flatpak asset -- just under date-based tags rather than semver. Verified both directions: v3.0.16 projectbluefin 200, tuna-os 404 v2026.09.14-9a9a913 tuna-os 200 v2026.09.08-2684a1d tuna-os 200 v3.0.14 (tuna-os) 404 So the repoint #50 asks for is achievable; it is a versioning-scheme change (INSTALLER_REPO and INSTALLER_VERSION have to move together), not a blocked one. Left as a comment rather than acted on because #48 is open against these same lines proposing the opposite direction, and which org is canonical is the open question in #50. Refs #50 Signed-off-by: Danathar --- iso/live/src/install-flatpaks.sh | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/iso/live/src/install-flatpaks.sh b/iso/live/src/install-flatpaks.sh index 8c70e3c8..9069d674 100644 --- a/iso/live/src/install-flatpaks.sh +++ b/iso/live/src/install-flatpaks.sh @@ -6,11 +6,25 @@ set -euo pipefail FLATPAK_CACHE=/var/cache/flatpak-dl INSTALLER_APP_ID=org.bootcinstaller.Installer -# projectbluefin/bootc-installer and tuna-os/bootc-installer share tag history -# through v3.0.9 (evidently a fork/mirror pair), but only -# projectbluefin/bootc-installer currently publishes the pinned release below -# (tuna-os/bootc-installer tops out at v3.0.14 on semver tags). See #50 for -# the open question of which org is canonical going forward. +# #50 asks for this to point at tuna-os/bootc-installer. It does not yet, +# and the reason is a VERSIONING change, not a missing artifact: +# +# projectbluefin/bootc-installer semver tags ... v3.0.13 v3.0.14 v3.0.16 +# tuna-os/bootc-installer semver tags ... v3.0.13 v3.0.14, +# then date tags v2026.09.08-2684a1d, ... +# +# The two share tag history through v3.0.14, then tuna-os switched to +# date-based tags. So v3.0.16 exists only here (verified: the flatpak asset +# 200s from projectbluefin and 404s from tuna-os at that tag), while +# tuna-os DOES publish the same org.bootcinstaller.Installer.flatpak asset at +# its date tags (verified 200 at v2026.09.14-9a9a913). +# +# Repointing therefore also means re-pinning onto a different versioning +# scheme, and #48 is open against these same lines proposing the opposite +# direction (stay here, add a sha256 pin). Which org is canonical is the open +# question in #50; whoever answers it should move INSTALLER_REPO and +# INSTALLER_VERSION together, because moving the repo alone breaks the build +# under `curl --fail`. INSTALLER_REPO=projectbluefin/bootc-installer FALLBACK_REPO=tuna-os/tuna-installer BUNDLE=org.bootcinstaller.Installer.flatpak