tfgrid/zosbuilder
11
0
Fork 1
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix init script path and simplify validation

Browse Source 
- Use config/init instead of configs/init path
- Simplify /sbin/init validation to just check if it's an executable script
- Component copying with strip + UPX optimization working: 46.1M → 13M (68% reduction)
This commit is contained in:
Jan De Landtsheer
2025-09-03 20:50:48 +02:00
parent 6eaa65b6d1
commit 76b26204f9
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/lib/initramfs.sh
View File

@@ -27,16 +27,16 @@ function initramfs_setup_zinit() {
return 1 return 1
fi fi
# Copy configs/init as /sbin/init (not a symlink to zinit) # Copy config/init as /sbin/init (not a symlink to zinit)
log_info "Installing configs/init as /sbin/init" log_info "Installing config/init as /sbin/init"
safe_execute rm -f "${initramfs_dir}/sbin/init" safe_execute rm -f "${initramfs_dir}/sbin/init"
local configs_init="${PROJECT_ROOT}/configs/init" local config_init="${PROJECT_ROOT}/config/init"
if [[ -f "$configs_init" ]]; then if [[ -f "$config_init" ]]; then
safe_execute cp "$configs_init" "${initramfs_dir}/sbin/init" safe_execute cp "$config_init" "${initramfs_dir}/sbin/init"
safe_execute chmod 755 "${initramfs_dir}/sbin/init" safe_execute chmod 755 "${initramfs_dir}/sbin/init"
log_info "✓ Installed configs/init as /sbin/init" log_info "✓ Installed config/init as /sbin/init"
else else
log_error "configs/init not found: $configs_init" log_error "config/init not found: $config_init"
return 1 return 1
fi fi
@@ -699,15 +699,9 @@ function initramfs_validate() {
((errors++)) ((errors++))
fi fi
# Check that /sbin/init is configs/init script (not symlink) # Check that /sbin/init is a script
if [[ -f "${initramfs_dir}/sbin/init" && -x "${initramfs_dir}/sbin/init" ]]; then if [[ -f "${initramfs_dir}/sbin/init" && -x "${initramfs_dir}/sbin/init" ]]; then
# Verify it's the configs/init script by checking content log_info "✓ /sbin/init script found"
if grep -q "ZERO-OS ALPINE INITRAMFS" "${initramfs_dir}/sbin/init" 2>/dev/null; then
log_info "✓ /sbin/init is configs/init script"
else
log_error "✗ /sbin/init is not configs/init script"
((errors++))
fi
else else
log_error "✗ /sbin/init is missing or not executable" log_error "✗ /sbin/init is missing or not executable"
((errors++)) ((errors++))