Merge pull request #12 from AeroCore-IO/testing

Bump docker/login-action to version 4.5.1 and update GRUB configuration

1 files changed, 23 insertions, 0 deletions

diff --git a/installer/build.sh b/installer/build.sh
index c119dcc..a382bcf 100755
--- a/installer/build.sh
+++ b/installer/build.sh
@@ -44,6 +44,13 @@ if [[ -d "${SCRIPT_DIR}/system_files/overrides" ]]; then
   cp -a "${SCRIPT_DIR}/system_files/overrides/." /
 fi
 
+# The target system is an upstream-built bootc image. Keep this installer-only
+# helper out of the installed image and invoke it after Anaconda mounts the
+# target rootfs.
+install -Dm0755 \
+  "${SCRIPT_DIR}/configure-target-grub.sh" \
+  /usr/libexec/aerocore-configure-target-grub
+
 # Plasma's live-session launcher defaults to start-here, and Fedora keeps
 # LOGO=fedora-logo-icon in the base live environment.
 for size in 16x16 22x22 24x24 32x32 36x36 48x48 64x64 96x96 128x128 256x256; do
@@ -127,6 +134,22 @@ if [ x\${target_root} = x ]; then
 fi
 systemd-firstboot --root=\${target_root} --hostname=aerocore-os
 %end
+
+%post --nochroot --log=/tmp/aerocore-grub.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 GRUB configuration >&2
+    exit 1
+fi
+/usr/libexec/aerocore-configure-target-grub \${target_root}
+%end
 EOF
 
 mkdir -p /usr/lib/bootc-image-builder