summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortranch <tranch.xiao@gmail.com>2026-07-24 17:29:04 +0800
committertranch <tranch.xiao@gmail.com>2026-07-24 17:34:21 +0800
commit41b6840fa4a8a41704a00a115b2338d30673e4ca (patch)
tree6af63ce98b693d1a38862f1759237435739e0d8c
parentcb1f8c566bf903d2643c3cc9ad3712c831a90880 (diff)
downloadAeroCore-OS-41b6840fa4a8a41704a00a115b2338d30673e4ca.tar.gz
AeroCore-OS-41b6840fa4a8a41704a00a115b2338d30673e4ca.zip
Rename live installer to installer ISO
Use installer ISO terminology across Just, workflows, scripts, docs, and image payloads while preserving compatibility aliases for existing commands.
-rw-r--r--.github/workflows/build-installer-iso.yml (renamed from .github/workflows/build-live-installer.yml)20
-rw-r--r--.github/workflows/validate-installer-iso.yml (renamed from .github/workflows/validate-live-installer.yml)12
-rw-r--r--Justfile21
-rw-r--r--README.md8
-rw-r--r--installer/Containerfile2
-rw-r--r--installer/iso.yaml6
-rwxr-xr-xjust_scripts/build-installer-iso.sh (renamed from just_scripts/build-live-installer.sh)4
-rwxr-xr-xjust_scripts/run-installer-iso.sh (renamed from just_scripts/run-live-installer.sh)2
8 files changed, 40 insertions, 35 deletions
diff --git a/.github/workflows/build-live-installer.yml b/.github/workflows/build-installer-iso.yml
index 0965c33..cfa7b80 100644
--- a/.github/workflows/build-live-installer.yml
+++ b/.github/workflows/build-installer-iso.yml
@@ -1,4 +1,4 @@
-name: Build live installer
+name: Build installer ISO
on:
workflow_dispatch:
@@ -24,8 +24,8 @@ concurrency:
cancel-in-progress: true
jobs:
- build-live-installer:
- name: Build KDE live installer
+ build-installer-iso:
+ name: Build KDE installer ISO
if: github.event_name != 'workflow_run' || (github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'push')
runs-on: ubuntu-24.04
permissions:
@@ -77,24 +77,24 @@ jobs:
run: |
sudo podman pull "${IMAGE_REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}"
- - name: Build live installer payload
+ - name: Build installer ISO payload
run: |
mkdir -p output
sudo podman tag \
"${IMAGE_REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}" \
- localhost/aerocore-live-payload:latest
+ localhost/aerocore-installer-payload:latest
sudo podman save \
--format oci-archive \
--output output/install-payload.oci \
- localhost/aerocore-live-payload:latest
+ localhost/aerocore-installer-payload:latest
sudo podman build \
--cap-add sys_admin \
--security-opt label=disable \
--build-arg "BASE_IMAGE=${LIVE_BASE_IMAGE}" \
- --build-arg "INSTALL_IMAGE_PAYLOAD=localhost/aerocore-live-payload:latest" \
+ --build-arg "INSTALL_IMAGE_PAYLOAD=localhost/aerocore-installer-payload:latest" \
--build-arg "INSTALL_IMAGE_PAYLOAD_ARCHIVE=/install-payload.oci" \
- --tag localhost/aerocore-live-payload:latest \
+ --tag localhost/aerocore-installer-payload:latest \
--file installer/Containerfile \
.
@@ -102,7 +102,7 @@ jobs:
id: build
uses: Zeglius/titanoboa@7737f4748458252ac827dca14b3d6dd09298472a # revamp-pr
with:
- image-ref: localhost/aerocore-live-payload:latest
+ image-ref: localhost/aerocore-installer-payload:latest
iso-dest: ${{ github.workspace }}/output/aerocore-os-${{ env.ISO_FILE_TAG }}-amd64.iso
- name: Normalize ISO output path
@@ -157,7 +157,7 @@ jobs:
if: github.ref_name == 'testing'
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
with:
- name: aerocore-os-live-installer-${{ env.ISO_FILE_TAG }}-checksum
+ name: aerocore-os-installer-iso-${{ env.ISO_FILE_TAG }}-checksum
path: ${{ steps.upload-directory.outputs.iso-upload-dir }}/*-CHECKSUM
if-no-files-found: error
retention-days: 1
diff --git a/.github/workflows/validate-live-installer.yml b/.github/workflows/validate-installer-iso.yml
index 3d35a5d..37f5496 100644
--- a/.github/workflows/validate-live-installer.yml
+++ b/.github/workflows/validate-installer-iso.yml
@@ -1,20 +1,20 @@
-name: Validate live installer
+name: Validate installer ISO
on:
pull_request:
paths:
- "Justfile"
- "installer/**"
- - "just_scripts/build-live-installer.sh"
- - ".github/workflows/build-live-installer.yml"
- - ".github/workflows/validate-live-installer.yml"
+ - "just_scripts/build-installer-iso.sh"
+ - ".github/workflows/build-installer-iso.yml"
+ - ".github/workflows/validate-installer-iso.yml"
permissions:
contents: read
jobs:
- validate-live-installer:
- name: Validate live installer inputs
+ validate-installer-iso:
+ name: Validate installer ISO inputs
runs-on: ubuntu-24.04
steps:
diff --git a/Justfile b/Justfile
index b65d2c9..f77828b 100644
--- a/Justfile
+++ b/Justfile
@@ -22,20 +22,25 @@ export INSTRUMENTS_RELEASE_API_BASE := env_var_or_default("INSTRUMENTS_RELEASE_A
alias build-vm := build-qcow2
alias rebuild-vm := rebuild-qcow2
alias run-vm := run-vm-qcow2
-alias build-live-iso := build-live-installer
-alias run-live-iso := run-live-installer
+alias build-installer := build-installer-iso
+alias run-installer := run-installer-iso
+# Backward-compatible aliases; these refer to the installer ISO, not a Live OS.
+alias build-live-iso := build-installer-iso
+alias run-live-iso := run-installer-iso
+alias build-live-installer := build-installer-iso
+alias run-live-installer := run-installer-iso
[private]
default:
@just --list
-# Build a Bazzite-style live installer ISO
-build-live-installer $target_image=("localhost/" + image_name) $tag=default_tag:
- @IMAGE_NAME="{{ target_image }}" IMAGE_TAG="{{ tag }}" ./just_scripts/build-live-installer.sh
+# Build a Bazzite-style installer ISO
+build-installer-iso $target_image=("localhost/" + image_name) $tag=default_tag:
+ @IMAGE_NAME="{{ target_image }}" IMAGE_TAG="{{ tag }}" ./just_scripts/build-installer-iso.sh
-# Boot the live installer ISO with QEMU
-run-live-installer:
- @./just_scripts/run-live-installer.sh
+# Boot the installer ISO with QEMU
+run-installer-iso:
+ @./just_scripts/run-installer-iso.sh
# Check Just Syntax
[group('Just')]
diff --git a/README.md b/README.md
index 3fc11c5..de33959 100644
--- a/README.md
+++ b/README.md
@@ -55,15 +55,15 @@ BASE_IMAGE=ghcr.io/ublue-os/bazzite-deck:testing just build
```
-To build the Bazzite-style live installer locally, first build the AeroCore
+To build the Bazzite-style installer ISO locally, first build the AeroCore
image and then run:
```bash
sudo just build
-just build-live-installer
-just run-live-installer
+just build-installer-iso
+just run-installer-iso
```
This requires privileged Podman, a rootful Podman API socket, and roughly
-70 GiB of free space. The live installer workflow consumes the published
+70 GiB of free space. The installer ISO workflow consumes the published
`latest` AeroCore image and uploads the ISO as a GitHub Actions artifact.
diff --git a/installer/Containerfile b/installer/Containerfile
index 50579e6..34c5e28 100644
--- a/installer/Containerfile
+++ b/installer/Containerfile
@@ -1,4 +1,4 @@
-# Build the live installer payload from a desktop Bazzite runtime.
+# Build the installer ISO payload from a desktop Bazzite runtime.
# The image installed to disk is supplied separately as INSTALL_IMAGE_PAYLOAD.
ARG BASE_IMAGE=ghcr.io/ublue-os/bazzite:stable
diff --git a/installer/iso.yaml b/installer/iso.yaml
index 8e6bd73..4b9fd2c 100644
--- a/installer/iso.yaml
+++ b/installer/iso.yaml
@@ -1,10 +1,10 @@
-label: "AeroCore-Live"
+label: "AeroCore-Installer"
grub2:
timeout: 3
entries:
- name: "Launch AeroCore Installer"
- linux: "/images/pxeboot/vmlinuz quiet rhgb root=live:CDLABEL=AeroCore-Live enforcing=0 rd.live.image"
+ linux: "/images/pxeboot/vmlinuz quiet rhgb root=live:CDLABEL=AeroCore-Installer enforcing=0 rd.live.image"
initrd: "/images/pxeboot/initrd.img"
- name: "Launch AeroCore Installer (Basic Graphics Mode)"
- linux: "/images/pxeboot/vmlinuz quiet rhgb root=live:CDLABEL=AeroCore-Live enforcing=0 rd.live.image nomodeset"
+ linux: "/images/pxeboot/vmlinuz quiet rhgb root=live:CDLABEL=AeroCore-Installer enforcing=0 rd.live.image nomodeset"
initrd: "/images/pxeboot/initrd.img"
diff --git a/just_scripts/build-live-installer.sh b/just_scripts/build-installer-iso.sh
index 45335cb..22d14a0 100755
--- a/just_scripts/build-live-installer.sh
+++ b/just_scripts/build-installer-iso.sh
@@ -10,7 +10,7 @@ image_tag="${IMAGE_TAG:-$(just generate-default-tag)}"
live_base_image="${LIVE_BASE_IMAGE:-quay.io/fedora/fedora-kinoite:43}"
installer_builder_image="${INSTALLER_BUILDER_IMAGE:-ghcr.io/jasonn3/build-container-installer:v1.5.0}"
source_image="${image_name}:${image_tag}"
-payload="localhost/aerocore-live-payload:latest"
+payload="localhost/aerocore-installer-payload:latest"
output_dir="${project_root}/output"
payload_archive="${output_dir}/install-payload.oci"
iso="${output_dir}/aerocore-os-${image_tag}-amd64.iso"
@@ -102,7 +102,7 @@ fi
ENABLE_CACHE_DNF="false" \
ENABLE_CACHE_SKOPEO="false" \
ENABLE_FLATPAK_DEPENDENCIES="false" \
- IMAGE_NAME="aerocore-live-payload" \
+ IMAGE_NAME="aerocore-installer-payload" \
IMAGE_REPO="localhost" \
IMAGE_SRC="containers-storage:${payload}" \
IMAGE_TAG="latest" \
diff --git a/just_scripts/run-live-installer.sh b/just_scripts/run-installer-iso.sh
index 2723aae..2c49164 100755
--- a/just_scripts/run-live-installer.sh
+++ b/just_scripts/run-installer-iso.sh
@@ -9,7 +9,7 @@ image_tag="${IMAGE_TAG:-$(just generate-default-tag)}"
iso="${project_root}/output/aerocore-os-${image_tag}-amd64.iso"
if [[ ! -f "${iso}" ]]; then
- just build-live-installer
+ just build-installer-iso
fi
podman run --rm --cap-add NET_ADMIN \