Normalize installer payload and host naming

Use a formal local installer image tag and set aerocore-os as the
default hostname in both the live image and installed target system.

5 files changed, 24 insertions, 8 deletions

diff --git a/.github/workflows/build-installer-iso.yml b/.github/workflows/build-installer-iso.yml
index bae0458..7650ebb 100644
--- a/.github/workflows/build-installer-iso.yml
+++ b/.github/workflows/build-installer-iso.yml
@@ -74,7 +74,7 @@ jobs:
           mkdir -p output
           sudo podman tag \
             "${IMAGE_REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}" \
-            localhost/aerocore-installer-payload:latest
+            localhost/aerocore-os-installer:latest
           sudo podman save \
             --format oci-archive \
             --output output/install-payload.oci \
@@ -86,7 +86,7 @@ jobs:
             --build-arg "BASE_IMAGE=${LIVE_BASE_IMAGE}" \
             --build-arg "INSTALL_IMAGE_PAYLOAD=localhost/aerocore-installer-payload:latest" \
             --build-arg "INSTALL_IMAGE_PAYLOAD_ARCHIVE=/install-payload.oci" \
-            --tag localhost/aerocore-installer-payload:latest \
+            --tag localhost/aerocore-os-installer:latest \
             --file installer/Containerfile \
             .
 
@@ -94,7 +94,7 @@ jobs:
         id: build
         uses: Zeglius/titanoboa@7737f4748458252ac827dca14b3d6dd09298472a # revamp-pr
         with:
-          image-ref: localhost/aerocore-installer-payload:latest
+          image-ref: localhost/aerocore-os-installer:latest
           iso-dest: ${{ github.workspace }}/output/aerocore-os-${{ env.ISO_FILE_TAG }}-amd64.iso
 
       - name: Normalize ISO output path
diff --git a/build_files/image-info b/build_files/image-info
index a52d666..bd66383 100755
--- a/build_files/image-info
+++ b/build_files/image-info
@@ -49,7 +49,7 @@ sed -i "s|^DOCUMENTATION_URL=.*|DOCUMENTATION_URL=\"$DOCUMENTATION_URL\"|" /usr/
 sed -i "s|^SUPPORT_URL=.*|SUPPORT_URL=\"$SUPPORT_URL\"|" /usr/lib/os-release
 sed -i "s|^BUG_REPORT_URL=.*|BUG_REPORT_URL=\"$BUG_SUPPORT_URL\"|" /usr/lib/os-release
 sed -i "s|^CPE_NAME=.*|CPE_NAME=\"cpe:/o:universal-blue:$IMAGE_ID\"|" /usr/lib/os-release
-sed -i "s/^DEFAULT_HOSTNAME=.*/DEFAULT_HOSTNAME=\"$IMAGE_ID\"/" /usr/lib/os-release
+sed -i "s/^DEFAULT_HOSTNAME=.*/DEFAULT_HOSTNAME=\"$IMAGE_NAME\"/" /usr/lib/os-release
 sed -i "s/^ID=fedora/ID=$IMAGE_ID\nID_LIKE=\"$IMAGE_LIKE\"/" /usr/lib/os-release
 sed -i "s/^LOGO=.*/LOGO=$LOGO_ICON/" /usr/lib/os-release
 sed -i "s/^ANSI_COLOR=.*/ANSI_COLOR=\"$LOGO_COLOR\"/" /usr/lib/os-release
diff --git a/installer/Containerfile b/installer/Containerfile
index 34c5e28..fa5d731 100644
--- a/installer/Containerfile
+++ b/installer/Containerfile
@@ -2,7 +2,7 @@
 # The image installed to disk is supplied separately as INSTALL_IMAGE_PAYLOAD.
 
 ARG BASE_IMAGE=ghcr.io/ublue-os/bazzite:stable
-ARG INSTALL_IMAGE_PAYLOAD=ghcr.io/AeroCore-IO/aerocore-bazzite-image:stable
+ARG INSTALL_IMAGE_PAYLOAD=ghcr.io/AeroCore-IO/aerocore-os:stable
 ARG INSTALL_IMAGE_PAYLOAD_ARCHIVE=/install-payload.oci
 
 FROM ${BASE_IMAGE}
diff --git a/installer/build.sh b/installer/build.sh
index aa30f42..c119dcc 100755
--- a/installer/build.sh
+++ b/installer/build.sh
@@ -111,6 +111,22 @@ df -h /var/tmp \${target_tmp}
 %end
 
 ostreecontainer --url=${INSTALL_IMAGE_PAYLOAD} --transport=containers-storage --no-signature-verification
+
+%post --nochroot --log=/tmp/aerocore-hostname.log
+set -eux
+target_root=
+for root in /mnt/sysroot /mnt/sysimage /var/mnt/sysimage; do
+    if mountpoint -q \${root}; then
+        target_root=\${root}
+        break
+    fi
+done
+if [ x\${target_root} = x ]; then
+    echo No mounted target system found for hostname setup >&2
+    exit 1
+fi
+systemd-firstboot --root=\${target_root} --hostname=aerocore-os
+%end
 EOF
 
 mkdir -p /usr/lib/bootc-image-builder
@@ -146,5 +162,5 @@ mkdir -p /boot/efi/EFI/BOOT
 cp -v "${grubx64}" /boot/efi/EFI/BOOT/BOOTX64.EFI
 cp -v "${grubx64}" /boot/efi/EFI/BOOT/fbx64.efi
 
-systemd-firstboot --timezone UTC
+systemd-firstboot --hostname aerocore-os --timezone UTC
 dnf clean all
diff --git a/just_scripts/build-installer-iso.sh b/just_scripts/build-installer-iso.sh
index 22d14a0..38e1718 100755
--- a/just_scripts/build-installer-iso.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-installer-payload:latest"
+payload="localhost/aerocore-os-installer: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-installer-payload" \
+  IMAGE_NAME="aerocore-os-installer" \
   IMAGE_REPO="localhost" \
   IMAGE_SRC="containers-storage:${payload}" \
   IMAGE_TAG="latest" \