diff --git a/.forgejo/workflows/iso.yml b/.forgejo/workflows/iso.yml index 24e7f1c..cc53bfa 100644 --- a/.forgejo/workflows/iso.yml +++ b/.forgejo/workflows/iso.yml @@ -81,8 +81,8 @@ jobs: MINIO_ACCESS_KEY: ${{ vars.MINIO_ACCESS_KEY || secrets.MINIO_ACCESS_KEY }} MINIO_SECRET_KEY: ${{ secrets.MINIO_SECRET_KEY }} run: | - # bootc-image-builder names the folder after its export, not the - # image type (it wasn't output/bootc-installer/), so look for it. + # Normally output/bootiso/: bootc-image-builder names the folder + # after its export, not the image type, so look rather than assume. iso=$(find output -name install.iso -print -quit) [ -n "$iso" ] || { echo "no install.iso under output/:"; find output -maxdepth 2; exit 1; } echo "ISO: $iso" diff --git a/README.md b/README.md index c5c0e5a..7acfd9c 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ list what's available. Notably: `bootc-image-builder`, landing in `output/bootiso/install.iso`. - `task build-installer-iso` — builds an install ISO using a custom Anaconda installer environment (`installer/Containerfile`) instead of - stock Fedora's, landing in `output/bootc-installer/install.iso`. See + stock Fedora's, landing in `output/bootiso/install.iso`. See [`docs/patched-anaconda-installer.md`](docs/patched-anaconda-installer.md) for forking/patching Anaconda itself. - `task test:stage` / `task test:boot` — stage the locally-built image as diff --git a/Taskfile.yml b/Taskfile.yml index 8cb7845..6baaa61 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -149,7 +149,7 @@ tasks: Build a bootable install ISO using the patched-Anaconda installer image to install the quine-linux bootc image, via bootc-image-builder's `bootc-installer` type. Output lands in - {{.OUTPUT_DIR}}/bootc-installer/install.iso. + {{.OUTPUT_DIR}}/bootiso/install.iso. preconditions: - sh: | case "$(uname -m)" in x86_64|amd64) a=amd64 ;; aarch64|arm64) a=arm64 ;; *) a="$(uname -m)" ;; esac @@ -182,7 +182,7 @@ tasks: --installer-payload-ref localhost/{{.IMAGE}} localhost/{{.INSTALLER_IMAGE}} generates: - - "{{.OUTPUT_DIR}}/bootc-installer/install.iso" + - "{{.OUTPUT_DIR}}/bootiso/install.iso" export-to-storage: internal: true diff --git a/docs/patched-anaconda-installer.md b/docs/patched-anaconda-installer.md index 92a23cd..3f2c374 100644 --- a/docs/patched-anaconda-installer.md +++ b/docs/patched-anaconda-installer.md @@ -48,7 +48,7 @@ matching a release-identity package. `installer/Containerfile` builds the vendored source with upstream's own `make install` (the same step Fedora's RPM runs), installs stock Fedora `anaconda-webui` for its dependencies, and copies the built files over - it. The ISO lands in `output/bootc-installer/install.iso`. + it. The ISO lands in `output/bootiso/install.iso`. 3. **Iterate:** edit, rerun. The build stage is cached until something in `vendor/` changes.