From d594d29732d0114fa0f5ebc105fcc7016f8208e1 Mon Sep 17 00:00:00 2001 From: Jan De Landtsheer Date: Fri, 5 Sep 2025 17:03:36 +0200 Subject: [PATCH] Fix zinit validation to check for YAML files instead of zinit.conf - zinit uses YAML configuration files, not zinit.conf - Update validation to check for *.yaml files in /etc/zinit directory - Fixes false validation error when zinit configuration is properly present --- scripts/lib/initramfs.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/lib/initramfs.sh b/scripts/lib/initramfs.sh index 1a2d1d7..16c3a68 100644 --- a/scripts/lib/initramfs.sh +++ b/scripts/lib/initramfs.sh @@ -758,11 +758,17 @@ function initramfs_validate() { log_info "✓ /sbin/init correctly absent (zinit called directly)" fi - # Check zinit configuration - if [[ -f "${initramfs_dir}/etc/zinit/zinit.conf" ]]; then - log_info "✓ zinit configuration found" + # Check zinit configuration directory (uses YAML files, not zinit.conf) + if [[ -d "${initramfs_dir}/etc/zinit" ]]; then + local yaml_count=$(find "${initramfs_dir}/etc/zinit" -name "*.yaml" | wc -l) + if [[ $yaml_count -gt 0 ]]; then + log_info "✓ zinit configuration found (${yaml_count} YAML files)" + else + log_error "✗ zinit YAML configuration files missing" + ((errors++)) + fi else - log_error "✗ zinit configuration missing" + log_error "✗ zinit configuration directory missing" ((errors++)) fi