forked from tfgrid/zosbuilder
initramfs: use /etc/ntp.conf (with ntpd.conf symlink), fix CPIO redirection, add customization logs
• scripts/lib/initramfs.sh: write /etc/ntp.conf, symlink ntpd.conf if absent; compute absolute output path before cd so cpio|xz redirection works; emit verification logs around initramfs_finalize_customization() • config/zinit/init/ntpd.sh: robust parsing of kernel ntp=, safe defaults, and launch BusyBox ntpd with -p servers
This commit is contained in:
@@ -297,12 +297,16 @@ function main_build_process() {
|
||||
export FULL_KERNEL_VERSION
|
||||
log_info "Resolved FULL_KERNEL_VERSION: ${FULL_KERNEL_VERSION}"
|
||||
fi
|
||||
|
||||
# Ensure rfs scripts are executable (avoid subshell to preserve quoting)
|
||||
safe_execute chmod +x ./scripts/rfs/*.sh
|
||||
echo ============= $(pwd)
|
||||
# Ensure rfs scripts are executable when present (be robust if directory is missing)
|
||||
if [[ -d "./scripts/rfs" ]]; then
|
||||
safe_execute find ./scripts/rfs -type f -name "*.sh" -exec chmod +x {} \;
|
||||
else
|
||||
log_warn "scripts/rfs directory not found; will invoke packers via bash to avoid +x requirement"
|
||||
fi
|
||||
|
||||
# Build modules flist (writes to dist/flists/modules-${FULL_KERNEL_VERSION}.fl)
|
||||
safe_execute ./scripts/rfs/pack-modules.sh
|
||||
safe_execute bash ./scripts/rfs/pack-modules.sh
|
||||
|
||||
# Build firmware flist with a reproducible tag:
|
||||
# Priority: env FIRMWARE_TAG > config/build.conf: FIRMWARE_TAG > "latest"
|
||||
@@ -317,7 +321,7 @@ function main_build_process() {
|
||||
fw_tag="${FIRMWARE_TAG:-latest}"
|
||||
fi
|
||||
log_info "Using firmware tag: ${fw_tag}"
|
||||
safe_execute env FIRMWARE_TAG="${fw_tag}" ./scripts/rfs/pack-firmware.sh
|
||||
safe_execute env FIRMWARE_TAG="${fw_tag}" bash ./scripts/rfs/pack-firmware.sh
|
||||
|
||||
# Embed flists inside initramfs at /etc/rfs for zinit init scripts
|
||||
local etc_rfs_dir="${INSTALL_DIR}/etc/rfs"
|
||||
|
||||
Reference in New Issue
Block a user