diff --git a/config/includes.chroot/usr/lib/live/boot/0042_ciss_post_decrypt_attest b/config/includes.chroot/usr/lib/live/boot/0042_ciss_post_decrypt_attest index 15fc470..d58c142 100644 --- a/config/includes.chroot/usr/lib/live/boot/0042_ciss_post_decrypt_attest +++ b/config/includes.chroot/usr/lib/live/boot/0042_ciss_post_decrypt_attest @@ -35,8 +35,8 @@ export CDLB_EXP_CA_FPR="@EXP_CA_FPR@" CDLB_MAPPER_NAME="${CDLB_MAPPER_NAME:-crypt_liveiso}" ### Attestation file locations inside decrypted rootfs. ------------------------------------------------------------------------ -CDLB_ATTEST_FPR_SHA="${CDLB_ATTEST_FPR_SHA:-/root/.ciss/attestation/${CDLB_EXP_FPR}.gpg.sha512sum.txt}" -CDLB_ATTEST_FPR_SIG="${CDLB_ATTEST_FPR_SIG:-/root/.ciss/attestation/${CDLB_EXP_FPR}.gpg.sha512sum.txt.sig}" +CDLB_ATTEST_FPR_SHA="${CDLB_ATTEST_FPR_SHA:-/root/root/.ciss/attestation/${CDLB_EXP_FPR}.gpg.sha512sum.txt}" +CDLB_ATTEST_FPR_SIG="${CDLB_ATTEST_FPR_SIG:-/root/root/.ciss/attestation/${CDLB_EXP_FPR}.gpg.sha512sum.txt.sig}" CDLB_KEY_DIR="${CDLB_KEY_DIR:-/etc/ciss/keys}" ### Declare functions ---------------------------------------------------------------------------------------------------------- @@ -68,26 +68,6 @@ log_ok() { printf '\e[92m[INFO] %s \n\e[0m' "$*"; } ####################################### log_er() { printf '\e[91m[FATAL] %s \n\e[0m' "$*"; } -### Locate decrypted rootfs mount ---------------------------------------------------------------------------------------------- -#_mp="" -#ROOTMP="" - -#for _mp in /run/live/rootfs /run/live/rootfs.squashfs /run/live/overlay /root ; do - -# if [ -d "${_mp}" ] && [ -e "${_mp}/etc" ]; then ROOTMP="${_mp}"; break; fi - -#done - -#if [ -z "${ROOTMP}" ]; then - -# log_er "0042() : No decrypted rootfs mount found." -# sleep 8 -# panic "[FATAL] No decrypted rootfs mount found." - -#fi - -#log_ok "0042() : Decrypted rootfs at: [${ROOTMP}]" - HASH_FILE="${CDLB_ATTEST_FPR_SHA}" SIGN_FILE="${CDLB_ATTEST_FPR_SIG}" KEYFILE="${CDLB_KEY_DIR}/${CDLB_EXP_FPR}.gpg" diff --git a/config/includes.chroot/usr/lib/live/boot/9990-networking.sh b/config/includes.chroot/usr/lib/live/boot/9990-networking.sh index 7757f7f..4f18ab1 100644 --- a/config/includes.chroot/usr/lib/live/boot/9990-networking.sh +++ b/config/includes.chroot/usr/lib/live/boot/9990-networking.sh @@ -4,7 +4,7 @@ # shellcheck shell=sh # SPDX-Version: 3.0 -# SPDX-CreationInfo: 2025-11-12; WEIDNER, Marc S.; +# SPDX-CreationInfo: 2025-12-03; 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.;