diff --git a/.gitea/ISSUE_TEMPLATE/ISSUE_TEMPLATE.yaml b/.gitea/ISSUE_TEMPLATE/ISSUE_TEMPLATE.yaml index aaa2d8e..b5f2e83 100644 --- a/.gitea/ISSUE_TEMPLATE/ISSUE_TEMPLATE.yaml +++ b/.gitea/ISSUE_TEMPLATE/ISSUE_TEMPLATE.yaml @@ -25,7 +25,7 @@ body: attributes: label: "Version" description: "Which version are you running? Use `./ciss_live_builder.sh -v`." - placeholder: "e.g., Master V8.03.768.2025.06.23" + placeholder: "e.g., Master V8.03.832.2025.06.24" validations: required: true diff --git a/.gitea/TODO/dockerfile b/.gitea/TODO/dockerfile index 9b3216e..0f34d5e 100644 --- a/.gitea/TODO/dockerfile +++ b/.gitea/TODO/dockerfile @@ -9,7 +9,7 @@ # SPDX-PackageName: CISS.debian.live.builder # SPDX-Security-Contact: security@coresecret.eu -### Version Master V8.03.768.2025.06.23 +### Version Master V8.03.832.2025.06.24 FROM debian:bookworm diff --git a/.gitea/TODO/render-md-to-html.yaml b/.gitea/TODO/render-md-to-html.yaml index fae5463..b59a5d4 100644 --- a/.gitea/TODO/render-md-to-html.yaml +++ b/.gitea/TODO/render-md-to-html.yaml @@ -9,7 +9,7 @@ # SPDX-PackageName: CISS.debian.live.builder # SPDX-Security-Contact: security@coresecret.eu -### Version Master V8.03.768.2025.06.23 +### Version Master V8.03.832.2025.06.24 name: ๐Ÿ” Render README.md to README.html. diff --git a/.gitea/trigger/t_generate_dns.yaml b/.gitea/trigger/t_generate_dns.yaml index 5c21ab4..b306791 100644 --- a/.gitea/trigger/t_generate_dns.yaml +++ b/.gitea/trigger/t_generate_dns.yaml @@ -11,5 +11,5 @@ build: counter: 1023 - version: V8.03.768.2025.06.23 + version: V8.03.832.2025.06.24 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=yaml diff --git a/.gitea/workflows/linter_char_scripts.yaml b/.gitea/workflows/linter_char_scripts.yaml index 9eae465..fb4c707 100644 --- a/.gitea/workflows/linter_char_scripts.yaml +++ b/.gitea/workflows/linter_char_scripts.yaml @@ -9,7 +9,7 @@ # SPDX-PackageName: CISS.debian.live.builder # SPDX-Security-Contact: security@coresecret.eu -### Version Master V8.03.768.2025.06.23 +### Version Master V8.03.832.2025.06.24 # Gitea Workflow: Shell-Script Linting # diff --git a/.gitea/workflows/render-dnssec-status.yaml b/.gitea/workflows/render-dnssec-status.yaml index 40bbdb0..472d866 100644 --- a/.gitea/workflows/render-dnssec-status.yaml +++ b/.gitea/workflows/render-dnssec-status.yaml @@ -9,7 +9,7 @@ # SPDX-PackageName: CISS.debian.live.builder # SPDX-Security-Contact: security@coresecret.eu -### Version Master V8.03.768.2025.06.23 +### Version Master V8.03.832.2025.06.24 name: ๐Ÿ›ก๏ธ Retrieve DNSSEC status of coresecret.dev. diff --git a/.gitea/workflows/render-dot-to-png.yaml b/.gitea/workflows/render-dot-to-png.yaml index 7945885..eca3a70 100644 --- a/.gitea/workflows/render-dot-to-png.yaml +++ b/.gitea/workflows/render-dot-to-png.yaml @@ -9,7 +9,7 @@ # SPDX-PackageName: CISS.debian.live.builder # SPDX-Security-Contact: security@coresecret.eu -### Version Master V8.03.768.2025.06.23 +### Version Master V8.03.832.2025.06.24 name: ๐Ÿ” Render Graphviz Diagrams. diff --git a/.version.properties b/.version.properties index 848e7b9..c68d2ae 100644 --- a/.version.properties +++ b/.version.properties @@ -15,5 +15,5 @@ properties_SPDX-License-Identifier="EUPL-1.2 OR LicenseRef-CCLA-1.0" properties_SPDX-LicenseComment="This file is part of the CISS.debian.installer.secure framework." properties_SPDX-PackageName="CISS.debian.live.builder" properties_SPDX-Security-Contact="security@coresecret.eu" -properties_version="V8.03.768.2025.06.23" +properties_version="V8.03.832.2025.06.24" # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=conf \ No newline at end of file diff --git a/CISS.debian.live.builder.spdx b/CISS.debian.live.builder.spdx index 531597e..2c2fcbd 100644 --- a/CISS.debian.live.builder.spdx +++ b/CISS.debian.live.builder.spdx @@ -6,7 +6,7 @@ Creator: Person: Marc S. Weidner (Centurion Intelligence Consulting Agency) Created: 2025-05-07T12:00:00Z Package: CISS.debian.live.builder PackageName: CISS.debian.live.builder -PackageVersion: Master V8.03.768.2025.06.23 +PackageVersion: Master V8.03.832.2025.06.24 PackageSupplier: Organization: Centurion Intelligence Consulting Agency PackageDownloadLocation: https://git.coresecret.dev/msw/CISS.debian.live.builder PackageHomePage: https://git.coresecret.dev/msw/CISS.debian.live.builder diff --git a/README.md b/README.md index ee29783..c7ab15b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ gitea: none include_toc: true --- -[![Static Badge](https://badges.coresecret.dev/badge/Release-V8.03.768.2025.06.23-white?style=plastic&logo=linux&logoColor=white&logoSize=auto&label=Release&color=%23FCC624)](https://git.coresecret.dev/msw/CISS.debian.live.builder) +[![Static Badge](https://badges.coresecret.dev/badge/Release-V8.03.832.2025.06.24-white?style=plastic&logo=linux&logoColor=white&logoSize=auto&label=Release&color=%23FCC624)](https://git.coresecret.dev/msw/CISS.debian.live.builder)   [![Static Badge](https://badges.coresecret.dev/badge/Licence-EUPL1.2-white?style=plastic&logo=europeanunion&logoColor=white&logoSize=auto&label=Licence&color=%23003399)](https://eupl.eu/1.2/en/)   [![Static Badge](https://badges.coresecret.dev/badge/opensourceinitiative-Compliant-white?style=plastic&logo=opensourceinitiative&logoColor=white&logoSize=auto&label=OSI&color=%233DA639)](https://opensource.org/license/eupl-1-2)   @@ -26,7 +26,7 @@ include_toc: true **Centurion Intelligence Consulting Agency Information Security Standard**
*Debian Live Build Generator for hardened live environment and CISS Debian Installer*
**Master Version**: 8.03
-**Build**: V8.03.768.2025.06.23
+**Build**: V8.03.832.2025.06.24
This shell wrapper automates the creation of a Debian Bookworm live ISO hardened according to the latest best practices in server and service security. It integrates into your build pipeline to deliver an isolated, robust environment suitable for @@ -142,7 +142,7 @@ This means function status of the **CISS.2025.debian.live.builder** ISO after d- This project adheres strictly to a structured versioning scheme following the pattern x.y.z-Date. -Example: `V8.03.768.2025.06.23` +Example: `V8.03.832.2025.06.24` `x.y.z` represents major (x), minor (y), and patch (z) version increments. diff --git a/ciss_live_builder.sh b/ciss_live_builder.sh index 4a0eb2f..b5ee86a 100644 --- a/ciss_live_builder.sh +++ b/ciss_live_builder.sh @@ -40,9 +40,10 @@ [[ ${#} -eq 0 ]] && { . ./lib/lib_usage.sh; usage; exit 1; } -### SOURCING MUST SET EARLY VARIABLES AND GUARD_SOURCING() +### SOURCING MUST SET EARLY VARIABLES, GUARD_SOURCING(), CHECK_GIT() . ./var/early.var.sh . ./lib/lib_guard_sourcing.sh +. ./lib/lib_git_var.sh ### CHECK FOR CONTACT, HELP, VERSION STRING, AND XTRACE DEBUG for arg in "$@"; do case "${arg,,}" in -c|--contact) . ./lib/lib_contact.sh; contact; exit 0;; esac; done @@ -50,7 +51,8 @@ for arg in "$@"; do case "${arg,,}" in -h|--help) . ./lib/lib_usage.sh; usage for arg in "$@"; do case "${arg,,}" in -v|--version) printf "\e[95mCISS.debian.live.builder Version: %s\e[0m\n" "${VAR_VERSION}"; exit 0;; esac; done ### ALL CHECKS DONE. READY TO START THE SCRIPT -for arg in "$@"; do case "${arg,,}" in -d|--debug) . ./meta_sources_debug.sh; check_git; debugger "${@}";; esac; done +check_git +for arg in "$@"; do case "${arg,,}" in -d|--debug) . ./meta_sources_debug.sh; debugger "${@}";; esac; done declare -gx VAR_SETUP="true" ### SOURCING VARIABLES diff --git a/config/includes.chroot/etc/ssh/sshd_config b/config/includes.chroot/etc/ssh/sshd_config index 1225eb5..8018ce2 100644 --- a/config/includes.chroot/etc/ssh/sshd_config +++ b/config/includes.chroot/etc/ssh/sshd_config @@ -9,7 +9,7 @@ # SPDX-PackageName: CISS.debian.live.builder # SPDX-Security-Contact: security@coresecret.eu -### Version Master V8.03.768.2025.06.23 +### Version Master V8.03.832.2025.06.24 ### https://www.ssh-audit.com/ ### ssh -Q cipher | cipher-auth | compression | kex | kex-gss | key | key-cert | key-plain | key-sig | mac | protocol-version | sig diff --git a/config/includes.chroot/etc/sysctl.d/99_local.hardened b/config/includes.chroot/etc/sysctl.d/99_local.hardened index c6c537e..38b3145 100644 --- a/config/includes.chroot/etc/sysctl.d/99_local.hardened +++ b/config/includes.chroot/etc/sysctl.d/99_local.hardened @@ -9,7 +9,7 @@ # SPDX-PackageName: CISS.debian.live.builder # SPDX-Security-Contact: security@coresecret.eu -### Version Master V8.03.768.2025.06.23 +### Version Master V8.03.832.2025.06.24 ### https://docs.kernel.org/ ### https://github.com/a13xp0p0v/kernel-hardening-checker/ diff --git a/config/includes.chroot/preseed/.iso/preseed_hash_generator.sh b/config/includes.chroot/preseed/.iso/preseed_hash_generator.sh index 81ba62c..3a704c3 100644 --- a/config/includes.chroot/preseed/.iso/preseed_hash_generator.sh +++ b/config/includes.chroot/preseed/.iso/preseed_hash_generator.sh @@ -10,7 +10,7 @@ # SPDX-PackageName: CISS.debian.live.builder # SPDX-Security-Contact: security@coresecret.eu -declare -gr VERSION="Master V8.03.768.2025.06.23" +declare -gr VERSION="Master V8.03.832.2025.06.24" ### VERY EARLY CHECK FOR DEBUGGING if [[ $* == *" --debug "* ]]; then diff --git a/config/includes.chroot/preseed/preseed.cfg b/config/includes.chroot/preseed/preseed.cfg index 5310cfc..1ac90a2 100644 --- a/config/includes.chroot/preseed/preseed.cfg +++ b/config/includes.chroot/preseed/preseed.cfg @@ -112,4 +112,4 @@ d-i preseed/late_command string sh /preseed/.ash/3_di_preseed_late_command.sh # Please consider donating to my work at: https://coresecret.eu/spenden/ ########################################################################################### -# Written by: ./preseed_hash_generator.sh Version: Master V8.03.768.2025.06.23 at: 10:18:37.9542 +# Written by: ./preseed_hash_generator.sh Version: Master V8.03.832.2025.06.24 at: 10:18:37.9542 diff --git a/docs/AUDIT_DNSSEC.md b/docs/AUDIT_DNSSEC.md index 842cfc4..9c6bc42 100644 --- a/docs/AUDIT_DNSSEC.md +++ b/docs/AUDIT_DNSSEC.md @@ -8,7 +8,7 @@ include_toc: true **Centurion Intelligence Consulting Agency Information Security Standard**
*Debian Live Build Generator for hardened live environment and CISS Debian Installer*
**Master Version**: 8.03
-**Build**: V8.03.768.2025.06.23
+**Build**: V8.03.832.2025.06.24
# 2. DNSSEC Status diff --git a/docs/AUDIT_HAVEGED.md b/docs/AUDIT_HAVEGED.md index 3a368e8..e9b6d35 100644 --- a/docs/AUDIT_HAVEGED.md +++ b/docs/AUDIT_HAVEGED.md @@ -8,7 +8,7 @@ include_toc: true **Centurion Intelligence Consulting Agency Information Security Standard**
*Debian Live Build Generator for hardened live environment and CISS Debian Installer*
**Master Version**: 8.03
-**Build**: V8.03.768.2025.06.23
+**Build**: V8.03.832.2025.06.24
# 2. Haveged Audit on Netcup RS 2000 G11 diff --git a/docs/AUDIT_LYNIS.md b/docs/AUDIT_LYNIS.md index b3fea0a..3691a1e 100644 --- a/docs/AUDIT_LYNIS.md +++ b/docs/AUDIT_LYNIS.md @@ -8,7 +8,7 @@ include_toc: true **Centurion Intelligence Consulting Agency Information Security Standard**
*Debian Live Build Generator for hardened live environment and CISS Debian Installer*
**Master Version**: 8.03
-**Build**: V8.03.768.2025.06.23
+**Build**: V8.03.832.2025.06.24
# 2. Lynis Audit: diff --git a/docs/AUDIT_SSH.md b/docs/AUDIT_SSH.md index a36f07e..0ed8a0d 100644 --- a/docs/AUDIT_SSH.md +++ b/docs/AUDIT_SSH.md @@ -8,7 +8,7 @@ include_toc: true **Centurion Intelligence Consulting Agency Information Security Standard**
*Debian Live Build Generator for hardened live environment and CISS Debian Installer*
**Master Version**: 8.03
-**Build**: V8.03.768.2025.06.23
+**Build**: V8.03.832.2025.06.24
# 2. SSH Audit by ssh-audit.com diff --git a/docs/AUDIT_TLS.md b/docs/AUDIT_TLS.md index a574dcd..344d235 100644 --- a/docs/AUDIT_TLS.md +++ b/docs/AUDIT_TLS.md @@ -8,7 +8,7 @@ include_toc: true **Centurion Intelligence Consulting Agency Information Security Standard**
*Debian Live Build Generator for hardened live environment and CISS Debian Installer*
**Master Version**: 8.03
-**Build**: V8.03.768.2025.06.23
+**Build**: V8.03.832.2025.06.24
# 2. TLS Audit: diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index c96cb5e..5c509c5 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -8,16 +8,23 @@ include_toc: true **Centurion Intelligence Consulting Agency Information Security Standard**
*Debian Live Build Generator for hardened live environment and CISS Debian Installer*
**Master Version**: 8.03
-**Build**: V8.03.768.2025.06.23
+**Build**: V8.03.832.2025.06.24
# 2. Changelog +## V8.03.832.2025.06.24 + +* Updated: + * [lib_check_provider.sh](../lib/lib_check_provider.sh) + * [lib_debug_header.sh](../lib/lib_debug_header.sh) + * [lib_trap_on_err.sh](../lib/lib_trap_on_err.sh) + ## V8.03.768.2025.06.23 * Updated [lib_clean_up.sh](../lib/lib_clean_up.sh): Removal of Lock FD and Artifacts. * Rearranged VARs sourcing: [early.var.sh](../var/early.var.sh) * Rearranged DEBUG XTRACE sourcing: [meta_sources_debug.sh](../meta_sources_debug.sh) -* Added Git Repo specific VARs: [lib_debug_var_git.sh](../lib/lib_debug_var_git.sh) +* Added Git Repo specific VARs: [lib_debug_var_git.sh](../lib/lib_git_var.sh) * Added ``guard_sourcing()``: [lib_guard_sourcing.sh](../lib/lib_guard_sourcing.sh) * to prevent the caller LIB-file from being sourced twice. diff --git a/docs/CNET.md b/docs/CNET.md index bb39902..22d304d 100644 --- a/docs/CNET.md +++ b/docs/CNET.md @@ -8,7 +8,7 @@ include_toc: true **Centurion Intelligence Consulting Agency Information Security Standard**
*Debian Live Build Generator for hardened live environment and CISS Debian Installer*
**Master Version**: 8.03
-**Build**: V8.03.768.2025.06.23
+**Build**: V8.03.832.2025.06.24
# 2. Centurion Net - Developer Branch Overview diff --git a/docs/CODING_CONVENTION.md b/docs/CODING_CONVENTION.md index 5fb703b..6b9b0a0 100644 --- a/docs/CODING_CONVENTION.md +++ b/docs/CODING_CONVENTION.md @@ -8,7 +8,7 @@ include_toc: true **Centurion Intelligence Consulting Agency Information Security Standard**
*Debian Live Build Generator for hardened live environment and CISS Debian Installer*
**Master Version**: 8.03
-**Build**: V8.03.768.2025.06.23
+**Build**: V8.03.832.2025.06.24
# 2. Coding Style diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 2a7868c..3fb040b 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -8,7 +8,7 @@ include_toc: true **Centurion Intelligence Consulting Agency Information Security Standard**
*Debian Live Build Generator for hardened live environment and CISS Debian Installer*
**Master Version**: 8.03
-**Build**: V8.03.768.2025.06.23
+**Build**: V8.03.832.2025.06.24
# 2. Contributing / participating diff --git a/docs/CREDITS.md b/docs/CREDITS.md index dadb440..4e5f184 100644 --- a/docs/CREDITS.md +++ b/docs/CREDITS.md @@ -8,7 +8,7 @@ include_toc: true **Centurion Intelligence Consulting Agency Information Security Standard**
*Debian Live Build Generator for hardened live environment and CISS Debian Installer*
**Master Version**: 8.03
-**Build**: V8.03.768.2025.06.23
+**Build**: V8.03.832.2025.06.24
# 2. Credits diff --git a/docs/DL_PUB_ISO.md b/docs/DL_PUB_ISO.md index e912368..3fb22be 100644 --- a/docs/DL_PUB_ISO.md +++ b/docs/DL_PUB_ISO.md @@ -8,7 +8,7 @@ include_toc: true **Centurion Intelligence Consulting Agency Information Security Standard**
*Debian Live Build Generator for hardened live environment and CISS Debian Installer*
**Master Version**: 8.03
-**Build**: V8.03.768.2025.06.23
+**Build**: V8.03.832.2025.06.24
# 2. Download the latest PUBLIC CISS.debian.live.ISO diff --git a/docs/DOCUMENTATION.md b/docs/DOCUMENTATION.md index 9f0eb64..5164940 100644 --- a/docs/DOCUMENTATION.md +++ b/docs/DOCUMENTATION.md @@ -8,12 +8,12 @@ include_toc: true **Centurion Intelligence Consulting Agency Information Security Standard**
*Debian Live Build Generator for hardened live environment and CISS Debian Installer*
**Master Version**: 8.03
-**Build**: V8.03.768.2025.06.23
+**Build**: V8.03.832.2025.06.24
# 2.1. Usage ````text CISS.debian.live.builder -Master V8.03.768.2025.06.23 +Master V8.03.832.2025.06.24 A lightweight Shell Wrapper for building a hardened Debian Bookworm Live ISO Image. (c) Marc S. Weidner, 2018 - 2025 @@ -133,7 +133,7 @@ A lightweight Shell Wrapper for building a hardened Debian Bookworm Live ISO Ima # 2.2. Contact ````text CISS.debian.live.builder -Master V8.03.768.2025.06.23 +Master V8.03.832.2025.06.24 A lightweight Shell Wrapper for building a hardened Debian Bookworm Live ISO Image. (c) Marc S. Weidner, 2018 - 2025 diff --git a/docs/REFERENCES.md b/docs/REFERENCES.md index 148d4f6..49f81c6 100644 --- a/docs/REFERENCES.md +++ b/docs/REFERENCES.md @@ -8,7 +8,7 @@ include_toc: true **Centurion Intelligence Consulting Agency Information Security Standard**
*Debian Live Build Generator for hardened live environment and CISS Debian Installer*
**Master Version**: 8.03
-**Build**: V8.03.768.2025.06.23
+**Build**: V8.03.832.2025.06.24
# 2. Resources diff --git a/lib/lib_check_provider.sh b/lib/lib_check_provider.sh index ca4fa6d..7684713 100644 --- a/lib/lib_check_provider.sh +++ b/lib/lib_check_provider.sh @@ -19,8 +19,9 @@ guard_sourcing ####################################### check_provider() { clear - cat << 'EOF' >| "${VAR_NOTES}" -Build: Master V8.03.768.2025.06.23 + cat << "EOF" >| "${VAR_NOTES}" +Build : "${VAR_VERSION}" +Commit : "${VAR_GIT_REL}" Press 'EXIT' to continue with CISS.debian.live.builder. diff --git a/lib/lib_contact.sh b/lib/lib_contact.sh index c02b05a..bfd6e48 100644 --- a/lib/lib_contact.sh +++ b/lib/lib_contact.sh @@ -21,7 +21,7 @@ contact() { clear cat << EOF $(echo -e "\e[92mCISS.debian.live.builder\e[0m") -$(echo -e "\e[92mMaster V8.03.768.2025.06.23\e[0m") +$(echo -e "\e[92mMaster V8.03.832.2025.06.24\e[0m") $(echo -e "\e[92mA lightweight Shell Wrapper for building a hardened Debian Bookworm Live ISO Image.\e[0m") $(echo -e "\e[97m(c) Marc S. Weidner, 2018 - 2025\e[0m") diff --git a/lib/lib_debug_header.sh b/lib/lib_debug_header.sh index 8b38e02..0e92277 100644 --- a/lib/lib_debug_header.sh +++ b/lib/lib_debug_header.sh @@ -34,7 +34,7 @@ debug_header() { declare -r arg_string="$2" { printf "\e[97m+\e[0m\e[92m%s: CISS.debian.live.builder Debug Log \e[0m\n" "$(date -u +%Y-%m-%dT%H:%M:%S.%4N%z)" - printf "\e[97m+\e[0m\e[92m%s: Git Commit : %s \e[0m\n" "$(date -u +%Y-%m-%dT%H:%M:%S.%4N%z)" "${VAR_GIT_HEAD_FULL}" + printf "\e[97m+\e[0m\e[92m%s: Git Commit : %s \e[0m\n" "$(date -u +%Y-%m-%dT%H:%M:%S.%4N%z)" "${VAR_GIT_REL}" printf "\e[97m+\e[0m\e[92m%s: Version : %s \e[0m\n" "$(date -u +%Y-%m-%dT%H:%M:%S.%4N%z)" "${VAR_VERSION}" printf "\e[97m+\e[0m\e[92m%s: Epoch : %s \e[0m\n" "$(date -u +%Y-%m-%dT%H:%M:%S.%4N%z)" "${EPOCHREALTIME}" printf "\e[97m+\e[0m\e[92m%s: Bash MAJ Release : %s \e[0m\n" "$(date -u +%Y-%m-%dT%H:%M:%S.%4N%z)" "${BASH_VERSINFO[0]}" diff --git a/lib/lib_debug_var_git.sh b/lib/lib_git_var.sh similarity index 100% rename from lib/lib_debug_var_git.sh rename to lib/lib_git_var.sh diff --git a/lib/lib_trap_on_err.sh b/lib/lib_trap_on_err.sh index 61caad0..f90e396 100644 --- a/lib/lib_trap_on_err.sh +++ b/lib/lib_trap_on_err.sh @@ -36,6 +36,7 @@ guard_sourcing print_file_err() { { printf "โŒ CISS.debian.live.builder Script failed. \n" + printf "โŒ Git Commit : %s \n" "${VAR_GIT_REL}" printf "โŒ Version : %s \n" "${VAR_VERSION}" printf "โŒ Hostsystem : %s \n" "${VAR_SYSTEM}" printf "โŒ Error : %s \n" "${ERRCODE}" @@ -79,6 +80,7 @@ print_file_err() { ####################################### print_scr_err() { printf "\e[91mโŒ CISS.debian.live.builder Script failed. \e[0m\n" >&2 + printf "\e[91mโŒ Git Commit : %s \e[0m\n" "${VAR_GIT_REL}" >&2 printf "\e[91mโŒ Version : %s \e[0m\n" "${VAR_VERSION}" >&2 printf "\e[91mโŒ Hostsystem : %s \e[0m\n" "${VAR_SYSTEM}" >&2 printf "\e[91mโŒ Error : %s \e[0m\n" "${ERRCODE}" >&2 diff --git a/lib/lib_usage.sh b/lib/lib_usage.sh index 17afc40..9a325aa 100644 --- a/lib/lib_usage.sh +++ b/lib/lib_usage.sh @@ -21,7 +21,7 @@ usage() { clear cat << EOF $(echo -e "\e[92mCISS.debian.live.builder\e[0m") -$(echo -e "\e[92mMaster V8.03.768.2025.06.23\e[0m") +$(echo -e "\e[92mMaster V8.03.832.2025.06.24\e[0m") $(echo -e "\e[92mA lightweight Shell Wrapper for building a hardened Debian Bookworm Live ISO Image.\e[0m") $(echo -e "\e[97m(c) Marc S. Weidner, 2018 - 2025\e[0m") diff --git a/meta_sources_debug.sh b/meta_sources_debug.sh index 625c557..91b4b37 100644 --- a/meta_sources_debug.sh +++ b/meta_sources_debug.sh @@ -10,23 +10,7 @@ # SPDX-PackageName: CISS.debian.live.builder # SPDX-Security-Contact: security@coresecret.eu -### Prevent this file from being sourced twice. Derive a safe guard-variable name from the script filename. -var_file_name="${BASH_SOURCE[0]##*/}" -var_safe_name="${var_file_name//[^a-zA-Z0-9_]/_}" -var_guard_var="_${var_safe_name}_LOADED" - -### If var_guard_var is already set, abort sourcing. -if [[ -n "${!var_guard_var:-}" ]]; then - unset var_file_name var_safe_name var_guard_var - return 0 -fi - -### Set var_guard_var and make it readonly+exported -declare -grx "${var_guard_var}"=1 -unset var_file_name var_safe_name var_guard_var - ### Sourcing Debug Libs . ./lib/lib_debug.sh . ./lib/lib_debug_header.sh -. ./lib/lib_debug_var_git.sh # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh diff --git a/scripts/9000-cdi-starter b/scripts/9000-cdi-starter index 3d20119..d89ee5a 100644 --- a/scripts/9000-cdi-starter +++ b/scripts/9000-cdi-starter @@ -15,7 +15,7 @@ printf "\e[95m++++ ++++ ++++ ++++ ++++ ++++ ++ ๐Ÿงช '%s' starting ... \e[0m\n" " # sleep 1 [[ ! -d /root/.cdi/log ]] && mkdir -p /root/.cdi/log -printf "CISS.debian.installer Master V8.03.768.2025.06.23 is up!" >| /root/.cdi/log/boot_finished_"$(date +"%Y-%m-%d_%H-%M-%S")".log +printf "CISS.debian.installer Master V8.03.832.2025.06.24 is up!" >| /root/.cdi/log/boot_finished_"$(date +"%Y-%m-%d_%H-%M-%S")".log if [[ -f /root/git/CISS.debian.installer/ciss_debian_installer.sh ]]; then chmod 0700 /root/git/CISS.debian.installer/ciss_debian_installer.sh diff --git a/var/early.var.sh b/var/early.var.sh index 633d217..a6b8672 100644 --- a/var/early.var.sh +++ b/var/early.var.sh @@ -17,7 +17,7 @@ declare -agx ARY_PARAM_ARRAY=("$@") declare -grx VAR_PARAM_COUNT="$#" declare -grx VAR_PARAM_STRNG="$*" declare -grx VAR_CONTACT="security@coresecret.eu" -declare -grx VAR_VERSION="Master V8.03.768.2025.06.23" +declare -grx VAR_VERSION="Master V8.03.832.2025.06.24" declare -grx VAR_SYSTEM="$(uname -a)" declare -gx VAR_HANDLER_AUTOBUILD="false" umask 0022