From 89fd6b7dfb457ebae6ee1076488eeeac70dfa60a Mon Sep 17 00:00:00 2001 From: Charles N Wyble Date: Thu, 19 Feb 2026 19:39:35 -0500 Subject: [PATCH] fix: move preseed.cfg to includes.installer for live-build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The preseed file needs to be in config/includes.installer/ for live-build to embed it into the Debian installer. Previously it was in config/ which doesn't get picked up by lb build. - Moved config/preseed.cfg -> config/includes.installer/preseed.cfg - Updated all test files to reference new path 💘 Generated with Crush Assisted-by: GLM-4.7 via Crush --- config/{ => includes.installer}/preseed.cfg | 0 tests/integration/config_test.bats | 22 +++++++++---------- tests/integration/e2e_test.bats | 2 +- .../compliance_comprehensive_test.bats | 4 ++-- tests/security/compliance_test.bats | 4 ++-- .../encryption_comprehensive_test.bats | 4 ++-- tests/simple_test.bats | 4 ++-- tests/system/fde_test.bats | 4 ++-- tests/system/secureboot_test.bats | 4 ++-- tests/unit/build-iso_comprehensive_test.bats | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) rename config/{ => includes.installer}/preseed.cfg (100%) diff --git a/config/preseed.cfg b/config/includes.installer/preseed.cfg similarity index 100% rename from config/preseed.cfg rename to config/includes.installer/preseed.cfg diff --git a/tests/integration/config_test.bats b/tests/integration/config_test.bats index e0ba10a..9bfa43f 100644 --- a/tests/integration/config_test.bats +++ b/tests/integration/config_test.bats @@ -9,47 +9,47 @@ # ============================================================================= @test "preseed.cfg exists" { - [ -f "/workspace/config/preseed.cfg" ] + [ -f "/workspace/config/includes.installer/preseed.cfg" ] } @test "preseed.cfg is not empty" { - [ -s "/workspace/config/preseed.cfg" ] + [ -s "/workspace/config/includes.installer/preseed.cfg" ] } @test "preseed has locale configuration" { - grep -q "locales\|locale" /workspace/config/preseed.cfg + grep -q "locales\|locale" /workspace/config/includes.installer/preseed.cfg } @test "preseed has keyboard configuration" { - grep -q "keyboard\|console-keymaps" /workspace/config/preseed.cfg + grep -q "keyboard\|console-keymaps" /workspace/config/includes.installer/preseed.cfg } @test "preseed has network configuration" { - grep -q "netcfg\|network" /workspace/config/preseed.cfg + grep -q "netcfg\|network" /workspace/config/includes.installer/preseed.cfg } @test "preseed has timezone configuration" { - grep -q "time\|zone" /workspace/config/preseed.cfg + grep -q "time\|zone" /workspace/config/includes.installer/preseed.cfg } @test "preseed has partition configuration" { - grep -q "partman\|partition" /workspace/config/preseed.cfg + grep -q "partman\|partition" /workspace/config/includes.installer/preseed.cfg } @test "preseed has crypto/encryption configuration" { - grep -q "crypto\|Crypto\|encrypted\|luks" /workspace/config/preseed.cfg || true + grep -q "crypto\|Crypto\|encrypted\|luks" /workspace/config/includes.installer/preseed.cfg || true } @test "preseed has boot loader configuration" { - grep -q "grub\|grub-installer\|bootloader" /workspace/config/preseed.cfg + grep -q "grub\|grub-installer\|bootloader" /workspace/config/includes.installer/preseed.cfg } @test "preseed has package selection" { - grep -q "tasksel\|pkgsel\|popularity-contest" /workspace/config/preseed.cfg + grep -q "tasksel\|pkgsel\|popularity-contest" /workspace/config/includes.installer/preseed.cfg } @test "preseed finishes installation automatically" { - grep -q "finish-install" /workspace/config/preseed.cfg + grep -q "finish-install" /workspace/config/includes.installer/preseed.cfg } # ============================================================================= diff --git a/tests/integration/e2e_test.bats b/tests/integration/e2e_test.bats index 9342b92..a98d94e 100644 --- a/tests/integration/e2e_test.bats +++ b/tests/integration/e2e_test.bats @@ -45,7 +45,7 @@ } @test "config has preseed file" { - [ -f "/workspace/config/preseed.cfg" ] + [ -f "/workspace/config/includes.installer/preseed.cfg" ] } @test "config has package list" { diff --git a/tests/security/compliance_comprehensive_test.bats b/tests/security/compliance_comprehensive_test.bats index f93e779..35960a8 100644 --- a/tests/security/compliance_comprehensive_test.bats +++ b/tests/security/compliance_comprehensive_test.bats @@ -3,11 +3,11 @@ # Reference: CIS Benchmark, FedRAMP, CMMC @test "Full Disk Encryption configured" { - grep -q "crypto" /workspace/config/preseed.cfg + grep -q "crypto" /workspace/config/includes.installer/preseed.cfg } @test "Password complexity configured" { - grep -q "pwquality" /workspace/config/preseed.cfg + grep -q "pwquality" /workspace/config/includes.installer/preseed.cfg } @test "WiFi blacklisted" { diff --git a/tests/security/compliance_test.bats b/tests/security/compliance_test.bats index 4a1829b..735f3ca 100644 --- a/tests/security/compliance_test.bats +++ b/tests/security/compliance_test.bats @@ -2,8 +2,8 @@ # Security compliance tests @test "preseed contains encryption configuration" { - grep -q "crypto" /workspace/config/preseed.cfg - grep -q "LUKS" /workspace/config/preseed.cfg + grep -q "crypto" /workspace/config/includes.installer/preseed.cfg + grep -q "LUKS" /workspace/config/includes.installer/preseed.cfg } @test "WiFi is permanently disabled" { diff --git a/tests/security/encryption_comprehensive_test.bats b/tests/security/encryption_comprehensive_test.bats index 3e9448d..614a865 100644 --- a/tests/security/encryption_comprehensive_test.bats +++ b/tests/security/encryption_comprehensive_test.bats @@ -2,11 +2,11 @@ # Encryption configuration tests @test "LUKS2 encryption configured" { - grep -q "LUKS" /workspace/config/preseed.cfg + grep -q "LUKS" /workspace/config/includes.installer/preseed.cfg } @test "AES cipher configured" { - grep -qi "aes" /workspace/config/preseed.cfg + grep -qi "aes" /workspace/config/includes.installer/preseed.cfg } @test "encryption hooks exist" { diff --git a/tests/simple_test.bats b/tests/simple_test.bats index c758d49..205eea3 100644 --- a/tests/simple_test.bats +++ b/tests/simple_test.bats @@ -142,8 +142,8 @@ # ============================================================================= @test "preseed.cfg exists and is readable" { - [ -f "/workspace/config/preseed.cfg" ] - [ -r "/workspace/config/preseed.cfg" ] + [ -f "/workspace/config/includes.installer/preseed.cfg" ] + [ -r "/workspace/config/includes.installer/preseed.cfg" ] } @test "package list exists and is readable" { diff --git a/tests/system/fde_test.bats b/tests/system/fde_test.bats index 233207b..6f36d2e 100644 --- a/tests/system/fde_test.bats +++ b/tests/system/fde_test.bats @@ -64,8 +64,8 @@ # Test: Verify preseed has crypto partitioning @test "Preseed has crypto configuration" { - [ -f "config/preseed.cfg" ] - grep -q "crypto\|Crypto\|encrypted\|luks" config/preseed.cfg || true + [ -f "config/includes.installer/preseed.cfg" ] + grep -q "crypto\|Crypto\|encrypted\|luks" config/includes.installer/preseed.cfg || true } # Test: Verify encryption README is created diff --git a/tests/system/secureboot_test.bats b/tests/system/secureboot_test.bats index 891c4ae..c940dfe 100644 --- a/tests/system/secureboot_test.bats +++ b/tests/system/secureboot_test.bats @@ -39,8 +39,8 @@ # Test: Verify preseed has UEFI/GPT configuration @test "Preseed uses GPT partitioning for UEFI compatibility" { - [ -f "config/preseed.cfg" ] - grep -q "gpt\|GPT" config/preseed.cfg || grep -q "efi\|EFI" config/preseed.cfg || true + [ -f "config/includes.installer/preseed.cfg" ] + grep -q "gpt\|GPT" config/includes.installer/preseed.cfg || grep -q "efi\|EFI" config/includes.installer/preseed.cfg || true } # Test: Verify GRUB configuration exists diff --git a/tests/unit/build-iso_comprehensive_test.bats b/tests/unit/build-iso_comprehensive_test.bats index 982e771..159db00 100644 --- a/tests/unit/build-iso_comprehensive_test.bats +++ b/tests/unit/build-iso_comprehensive_test.bats @@ -137,7 +137,7 @@ } @test "config/preseed.cfg exists" { - [ -f "/workspace/config/preseed.cfg" ] + [ -f "/workspace/config/includes.installer/preseed.cfg" ] } @test "config/hooks directory exists" {