diff --git a/lib/lib_cdi.sh b/lib/lib_cdi.sh index a9a7fc5..ab272b9 100644 --- a/lib/lib_cdi.sh +++ b/lib/lib_cdi.sh @@ -37,7 +37,7 @@ cdi() { fi cp "${VAR_WORKDIR}/scripts/9999-cdi-starter" "${VAR_HANDLER_BUILD_DIR}/config/includes.chroot/usr/lib/live/config/9999-cdi-starter" - chmod 0750 "${VAR_HANDLER_BUILD_DIR}/config/includes.chroot/usr/lib/live/config/9999-cdi-starter" + chmod 0755 "${VAR_HANDLER_BUILD_DIR}/config/includes.chroot/usr/lib/live/config/9999-cdi-starter" chown root:root "${VAR_HANDLER_BUILD_DIR}/config/includes.chroot/usr/lib/live/config/9999-cdi-starter" declare tmp_entry diff --git a/lib/lib_lb_config_write_trixie.sh b/lib/lib_lb_config_write_trixie.sh index bf30e31..c982048 100644 --- a/lib/lib_lb_config_write_trixie.sh +++ b/lib/lib_lb_config_write_trixie.sh @@ -117,6 +117,8 @@ lb_config_write_trixie() { ### https://gitlab.tails.boum.org/tails/tails/-/blob/stable/config/chroot_local-includes/usr/share/tails/build/mksquashfs-excludes mkdir -p "${VAR_HANDLER_BUILD_DIR}/config/rootfs" cat << 'EOF' >| "${VAR_HANDLER_BUILD_DIR}/config/rootfs/excludes" +root/.wget-hsts +tmp/* EOF chmod 0644 "${VAR_HANDLER_BUILD_DIR}/config/rootfs/excludes" diff --git a/scripts/9999-cdi-starter b/scripts/9999-cdi-starter index 1e3efd7..4d6f34b 100644 --- a/scripts/9999-cdi-starter +++ b/scripts/9999-cdi-starter @@ -113,17 +113,16 @@ readonly -f sysp ####################################### main() { ### Declare Arrays, HashMaps, and Variables. - declare -r var_repo_url="https://git.coresecret.dev/msw/CISS.debian.installer.git" - declare -r var_repo_dir="/root/git/CISS.debian.installer" - declare -i i="" - declare var_log="" var_mode="" - - var_log="/root/.ciss/cdi/log/9999-cdi-starter_$(date +"%Y-%m-%d_%H-%M-%S").log" - touch "${var_log}" + declare -r var_repo_url="https://git.coresecret.dev/msw/CISS.debian.installer.git" + declare -r var_repo_dir="/root/git/CISS.debian.installer" + declare -i i="" + declare var_log="" var_mode="" ### Prepare logging. install -d -m 0700 /root/.ciss/cdi install -d -m 0700 /root/.ciss/cdi/log + var_log="/root/.ciss/cdi/log/9999-cdi-starter_$(date +"%Y-%m-%d_%H-%M-%S").log" + touch "${var_log}" # shellcheck disable=SC2312 exec > >(tee -a "${var_log}") 2>&1