Apply var tmp fix in installer payload

Write the pre-install /var/tmp bind mount hook from installer/build.sh so both Titanoboa CI builds and local ISO builds carry the fix. The previous lorax template path was only wired through the local helper and did not affect GitHub Actions.

2 files changed, 19 insertions, 1 deletions

diff --git a/installer/build.sh b/installer/build.sh
index c8ac830..aa30f42 100755
--- a/installer/build.sh
+++ b/installer/build.sh
@@ -91,6 +91,25 @@ fi
 # Tell Anaconda to install the bootc container that was loaded above.
 mkdir -p /var/lib/rpm-state
 cat >> /usr/share/anaconda/interactive-defaults.ks <<EOF
+%pre-install --log=/tmp/aerocore-var-tmp.log
+set -eux
+target_tmp=
+for root in /mnt/sysimage /mnt/sysroot /var/mnt/sysimage; do
+    if mountpoint -q \${root}; then
+        target_tmp=\${root}/var/tmp
+        break
+    fi
+done
+if [ x\${target_tmp} = x ]; then
+    echo No mounted target system found for /var/tmp bind mount >&2
+    exit 1
+fi
+mkdir -p \${target_tmp}
+chmod 1777 \${target_tmp}
+mount --bind \${target_tmp} /var/tmp
+df -h /var/tmp \${target_tmp}
+%end
+
 ostreecontainer --url=${INSTALL_IMAGE_PAYLOAD} --transport=containers-storage --no-signature-verification
 EOF
 
diff --git a/installer/lorax_templates/use_target_var_tmp.tmpl b/installer/lorax_templates/use_target_var_tmp.tmpl
deleted file mode 100644
index 2d099d1..0000000
--- a/installer/lorax_templates/use_target_var_tmp.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-append usr/share/anaconda/interactive-defaults.ks "\n%pre-install --log=/tmp/aerocore-var-tmp.log\nset -eux\ntarget_tmp=\nfor root in /mnt/sysimage /mnt/sysroot /var/mnt/sysimage; do\n    if mountpoint -q ${root}; then\n        target_tmp=${root}/var/tmp\n        break\n    fi\ndone\nif [ x${target_tmp} = x ]; then\n    echo No mounted target system found for /var/tmp bind mount >&2\n    exit 1\nfi\nmkdir -p ${target_tmp}\nchmod 1777 ${target_tmp}\nmount --bind ${target_tmp} /var/tmp\ndf -h /var/tmp ${target_tmp}\n%end"