V8.00.000.2025.06.17

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>

lib/0060_trap_err.sh

@@ -217,5 +217,6 @@ trap_err() {
   esac
   print_file_err
   print_scr_err
+
 }
 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

lib/0070_trap_exit.sh

@@ -131,12 +131,16 @@ trap_exit_non_zero() {
   declare -r var_cmmd="$5"
 
   if [[ "${ERRTRAP}" == "false" ]]; then
+
     if [[ "${VAR_DEBUG_TRACE}" == "true" || "${VAR_DEBUG_TRAP}" == "true" ]]; then dump_vars_exiting; fi
+
     case "${VAR_IN_DIALOG_WR}" in
       box   ) dialog_box_cleaner   ;;
       gauge ) dialog_gauge_cleaner ;;
     esac
+
     clean_up "${var_code}"
+
     printf "%b❌ Trap on 'EXIT'      : CISS.debian.installer Script failed. %b%b" "${RED}" "${RES}" "${NL}" | tee -a "${LOG_EXT}"
     printf "%b❌                     : This was most probably caused by an unbound variable. %b%b" "${RED}" "${RES}" "${NL}" | tee -a "${LOG_EXT}"
     printf "%b❌ GIT Commit          : %s %b%b" "${RED}" "${VAR_GIT_REL}" "${RES}" "${NL}" | tee -a "${LOG_EXT}"

lib/0090_clean_up.sh

@@ -27,17 +27,28 @@ guard_sourcing
 #######################################
 clean_up() {
   declare var_clean_exit_code="$1"
+
   rm -f -- "${VAR_KERNEL_INF}"
   rm -f -- "${VAR_KERNEL_SRT}"
   rm -f -- "${VAR_KERNEL_TMP}"
   rm -f -- "${VAR_NOTES}"
+
+  if [[ "${VAR_CHROOT_ACTIVATED}" == "system" ]]; then
+    exiting_chroot_system
+  elif [[ "${VAR_CHROOT_ACTIVATED}" == "recovery" ]]; then
+    exiting_chroot_recovery
+  fi
+
   ### Release advisory lock on FD 127.
   flock -u 127
+
   ### Close file descriptor 127.
   exec 127>&-
+
   ### Remove the lockfile artifact.
   rm -f /run/lock/ciss_debian_installer.lock
   if (( var_clean_exit_code == 0 )); then rm -f -- "${LOG_ERR}"; fi
+
   return 0
 }
 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh