From 1a903aeb8d598f8d9d571c27584a455a57591f0d0d2f433bd9af1b293ee6cdfe Mon Sep 17 00:00:00 2001 From: "Marc S. Weidner" Date: Sun, 19 Oct 2025 07:41:20 +0100 Subject: [PATCH] V8.13.224.2025.10.19 Signed-off-by: Marc S. Weidner --- .../trigger/t_generate_PRIVATE_trixie_0.yaml | 2 +- .../trigger/t_generate_PRIVATE_trixie_1.yaml | 2 +- .gitea/trigger/t_generate_dns.yaml | 2 +- .../hooks/live/0000_basic_chroot_setup.chroot | 8 +---- config/includes.chroot/root/.zshenv | 32 +++++++++++++++++++ 5 files changed, 36 insertions(+), 10 deletions(-) create mode 100644 config/includes.chroot/root/.zshenv diff --git a/.gitea/trigger/t_generate_PRIVATE_trixie_0.yaml b/.gitea/trigger/t_generate_PRIVATE_trixie_0.yaml index bdea07a..2b0c186 100644 --- a/.gitea/trigger/t_generate_PRIVATE_trixie_0.yaml +++ b/.gitea/trigger/t_generate_PRIVATE_trixie_0.yaml @@ -10,6 +10,6 @@ # SPDX-Security-Contact: security@coresecret.eu build: - counter: 1023 + counter: 1024 version: V8.13.224.2025.10.19 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=yaml diff --git a/.gitea/trigger/t_generate_PRIVATE_trixie_1.yaml b/.gitea/trigger/t_generate_PRIVATE_trixie_1.yaml index bdea07a..2b0c186 100644 --- a/.gitea/trigger/t_generate_PRIVATE_trixie_1.yaml +++ b/.gitea/trigger/t_generate_PRIVATE_trixie_1.yaml @@ -10,6 +10,6 @@ # SPDX-Security-Contact: security@coresecret.eu build: - counter: 1023 + counter: 1024 version: V8.13.224.2025.10.19 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=yaml diff --git a/.gitea/trigger/t_generate_dns.yaml b/.gitea/trigger/t_generate_dns.yaml index 2c744e8..a574068 100644 --- a/.gitea/trigger/t_generate_dns.yaml +++ b/.gitea/trigger/t_generate_dns.yaml @@ -10,6 +10,6 @@ # SPDX-Security-Contact: security@coresecret.eu build: - counter: 1023 + counter: 1024 version: V8.13.224.2025.10.19 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=yaml diff --git a/config/hooks/live/0000_basic_chroot_setup.chroot b/config/hooks/live/0000_basic_chroot_setup.chroot index 8c4a619..c395564 100644 --- a/config/hooks/live/0000_basic_chroot_setup.chroot +++ b/config/hooks/live/0000_basic_chroot_setup.chroot @@ -112,12 +112,6 @@ if [ "${ENABLE_XDG_BASH_HISTORY:-1}" = "1" ] && [ -n "${BASH_VERSION:-}" ]; then export HISTFILE="${XDG_STATE_HOME}/bash/history" fi -### Zsh history -> XDG_STATE_HOME (best-effort; zsh might not read /etc/profile) -if [ "${ENABLE_XDG_ZSH_HISTORY:-1}" = "1" ] && [ -n "${ZSH_VERSION:-}" ]; then - [ -d "${XDG_STATE_HOME}/zsh" ] || install -d -m 0700 -- "${XDG_STATE_HOME}/zsh" - export HISTFILE="${XDG_STATE_HOME}/zsh/history" -fi - ### Less history -> XDG_STATE_HOME if [ "${ENABLE_XDG_LESS_HISTORY:-1}" = "1" ]; then [ -d "${XDG_STATE_HOME}/less" ] || install -d -m 0700 -- "${XDG_STATE_HOME}/less" @@ -143,7 +137,7 @@ EOF ####################################### generate_ciss_xdg_tmp_sh() { cat << 'EOF' >> /root/ciss_xdg_tmp.sh - #!/bin/bash +#!/bin/bash # SPDX-Version: 3.0 # SPDX-CreationInfo: 2025-06-17; WEIDNER, Marc S.; # SPDX-ExternalRef: GIT https://git.coresecret.dev/msw/CISS.debian.installer.git diff --git a/config/includes.chroot/root/.zshenv b/config/includes.chroot/root/.zshenv new file mode 100644 index 0000000..afd1d52 --- /dev/null +++ b/config/includes.chroot/root/.zshenv @@ -0,0 +1,32 @@ +# SPDX-Version: 3.0 +# SPDX-CreationInfo: 2025-10-19; WEIDNER, Marc S.; +# SPDX-ExternalRef: GIT https://git.coresecret.dev/msw/CISS.debian.live.builder.git +# SPDX-FileContributor: WEIDNER, Marc S.; Centurion Intelligence Consulting Agency +# SPDX-FileCopyrightText: 2024-2025; WEIDNER, Marc S.; +# SPDX-FileType: SOURCE +# SPDX-License-Identifier: EUPL-1.2 OR LicenseRef-CCLA-1.0 +# SPDX-LicenseComment: This file is part of the CISS.debian.installer.secure framework. +# SPDX-PackageName: CISS.debian.live.builder +# SPDX-Security-Contact: security@coresecret.eu + +: "${XDG_CONFIG_HOME:=${HOME}/.config}" +: "${XDG_CACHE_HOME:=${HOME}/.cache}" +: "${XDG_DATA_HOME:=${HOME}/.local/share}" +: "${XDG_STATE_HOME:=${HOME}/.local/state}" +if [ -z "${XDG_RUNTIME_DIR:-}" ]; then + if [ -d "/run/user/$(id -u)" ]; then + XDG_RUNTIME_DIR="/run/user/$(id -u)" + else + XDG_RUNTIME_DIR="/tmp/xdg-runtime-$(id -u)" + fi +fi + +export XDG_CONFIG_HOME XDG_CACHE_HOME XDG_DATA_HOME XDG_STATE_HOME XDG_RUNTIME_DIR + +### Zsh history -> XDG_STATE_HOME (best-effort; zsh might not read /etc/profile) +if [ "${ENABLE_XDG_ZSH_HISTORY:-1}" = "1" ] && [ -n "${ZSH_VERSION:-}" ]; then + [ -d "${XDG_STATE_HOME}/zsh" ] || install -d -m 0700 -- "${XDG_STATE_HOME}/zsh" + export HISTFILE="${XDG_STATE_HOME}/zsh/history" +fi + +# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh