From 3fc34866ab9092445039f1da3c9f71c60f30f2ee Mon Sep 17 00:00:00 2001
From: Craig Jennings <c@cjennings.net>
Date: Sat, 24 Jan 2026 12:23:45 -0600
Subject: Fix LUKS btrfs installation and reduce ISO size

- Fix GRUB cryptodisk: configure_grub() heredoc was overwriting LUKS
  settings added by configure_luks_grub(). Moved LUKS GRUB config
  (GRUB_ENABLE_CRYPTODISK=y, cryptdevice cmdline) into configure_grub()
  after the heredoc writes the base config.

- Fix ISO bloat: archsetup copy was including vm-images (17GB).
  Changed from cp -r to rsync with exclusions for vm-images,
  test-results, .qcow2, and .iso files. ISO now 2.0GB.

- btrfs-luks VM test now passes.
---
 build.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index b3546bb..65043ca 100755
--- a/build.sh
+++ b/build.sh
@@ -424,12 +424,17 @@ if grep -q "file_permissions=" "$PROFILE_DIR/profiledef.sh"; then
     }' "$PROFILE_DIR/profiledef.sh"
 fi
 
-# Copy archsetup into airootfs
+# Copy archsetup into airootfs (exclude large/unnecessary directories)
 if [[ -d /home/cjennings/code/archsetup ]]; then
     info "Copying archsetup into ISO..."
-    cp -r /home/cjennings/code/archsetup "$PROFILE_DIR/airootfs/code/"
-    rm -rf "$PROFILE_DIR/airootfs/code/archsetup/.git"
-    rm -rf "$PROFILE_DIR/airootfs/code/archsetup/.claude"
+    mkdir -p "$PROFILE_DIR/airootfs/code"
+    rsync -a --exclude='.git' \
+             --exclude='.claude' \
+             --exclude='vm-images' \
+             --exclude='test-results' \
+             --exclude='*.qcow2' \
+             --exclude='*.iso' \
+             /home/cjennings/code/archsetup "$PROFILE_DIR/airootfs/code/"
 fi
 
 # Pre-populate tealdeer (tldr) cache for offline use
-- 
cgit v1.2.3