V8.00.000.2025.06.17

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

ciss_debian_installer.sh

@@ -218,11 +218,11 @@ generate_crypttab
 echo "MAIN PROGRAM SEQUENCE: generate_sources() ..."
 generate_sources
 echo "MAIN PROGRAM SEQUENCE: minimal_toolset() ..."
-minimal_toolset # TODO: Checks ongoing.
+minimal_toolset
 echo "MAIN PROGRAM SEQUENCE: setup_skel() ..."
 setup_skel
 echo "MAIN PROGRAM SEQUENCE: setup_timezone() ..."
-setup_timezone
+setup_timezone # TODO: Checks ongoing.
 echo "MAIN PROGRAM SEQUENCE: setup_locales() ..."
 setup_locales
 # TODO: Implement Clang Build Chain and MOK Signing Workflow

func/system/4060_generate_crypttab.sh

@@ -27,7 +27,7 @@ guard_sourcing
 write_crypttab() {
   declare write_label="$1" write_dev="$2" write_key_file="$3" write_opts="$4"
 
-  printf "%-43s %-46s %-30s %s\n" "${write_label}" "${write_dev}" "${write_key_file}" "${write_opts}" >> "${TARGET}/etc/crypttab"
+  printf "%-43s%-46s%-40s%s \n" "${write_label}" "${write_dev}" "${write_key_file}" "${write_opts}" >> "${TARGET}/etc/crypttab"
   do_log "info" "file_only" "4060() crypttab entry generated: [${write_label} ${write_dev} ${write_key_file} ${write_opts}]."
 
   return 0
@@ -69,7 +69,7 @@ generate_crypttab() {
 # SPDX-PackageName: CISS.debian.installer
 # SPDX-Security-Contact: security@coresecret.eu
 
-# /etc/fstab            : Generated by CISS.debian.installer ${VAR_VERSION}
+# /etc/crypttab         : Generated by CISS.debian.installer ${VAR_VERSION}
 # Architecture          : ${VAR_ARCHITECTURE}
 # Distribution          : ${VAR_CODENAME}
 

func/system/4090_minimal_toolset.sh

@@ -67,6 +67,7 @@ minimal_toolset() {
   )
 
   declare -a  ary_missing_pkgs=() ary_unique_pkgs=()
+  declare -r  var_logfile="${DIR_LOG}/4090_minimal_toolset_install.log"
   declare     var_bin="" var_bin=""
 
   ### Installation most basic packages.
@@ -88,19 +89,20 @@ minimal_toolset() {
     # shellcheck disable=SC2312
     mapfile -t ary_unique_pkgs < <(printf '%s\n' "${ary_missing_pkgs[@]}" | sort -u)
     do_log "debug" "file_only" "4090() [ary_unique_pkgs]='${ary_unique_pkgs[*]}'."
-    do_in_target "${TARGET}" apt-get install -y --no-install-recommends "${ary_unique_pkgs[@]}"
+    # shellcheck disable=SC2312
+    do_in_target "${TARGET}" apt-get install -y --no-install-recommends "${ary_unique_pkgs[@]}" 2>&1 | tee -a "${var_logfile}"
 
   fi
 
   ### Ensure systemd and machine-id are in place
   if ! do_in_target_script "${TARGET}" "command -v systemctl >/dev/null"; then
 
-    do_log "info" "file_only" "4090() 'systemctl' not found — installing 'systemd' and dependencies."
+    do_log "info" "file_only" "4090() 'systemctl' NOT found, installing 'systemd' and dependencies."
     do_in_target "${TARGET}" apt-get install -y --no-install-recommends systemd systemd-sysv dbus
 
   else
 
-    do_log "info" "file_only" "4090() 'systemctl' found — skipping installation of systemd."
+    do_log "info" "file_only" "4090() 'systemctl' found, skipping installation of systemd."
 
   fi
 
@@ -112,7 +114,7 @@ minimal_toolset() {
 
   else
 
-    do_log "info" "file_only" "4090() Existing machine-id found — no action needed."
+    do_log "info" "file_only" "4090() Existing 'machine-id' found, no action needed."
 
   fi
 

func/system/4092_minimal_checks.sh

@@ -36,7 +36,7 @@ minimal_checks() {
 
   else
 
-    do_log "warning" "file_only" "4040() '/etc/fstab' verification returned errors — see '${DIR_LOG}/fstab.verify.log'."
+    do_log "warning" "file_only" "4040() '/etc/fstab' verification returned errors, see '${DIR_LOG}/fstab.verify.log'."
 
   fi
 

func/system/4095_setup_skel.sh

@@ -23,11 +23,13 @@ guard_sourcing
 #   0: on success
 #######################################
 setup_skel() {
-  install -D -m 0644 -o root -g root "${VAR_SETUP_PATH}/includes/etc/skel/.bashrc" "${TARGET}/etc/skel/"
+  mkdir -p "${TARGET}/etc/skel/.ciss"
-  install -D -m 0644 -o root -g root "${VAR_SETUP_PATH}/includes/etc/skel/.zshrc" "${TARGET}/etc/skel/"
+
-  install -D -m 0644 -o root -g root "${VAR_SETUP_PATH}/includes/root/.ciss/alias" "${TARGET}/etc/skel/.ciss/"
+  install -m 0644 -o root -g root "${VAR_SETUP_PATH}/includes/etc/skel/.bashrc" "${TARGET}/etc/skel/.bashrc"
-  install -D -m 0644 -o root -g root "${VAR_SETUP_PATH}/includes/root/.ciss/clean_logout.sh" "${TARGET}/etc/skel/.ciss/"
+  install -m 0644 -o root -g root "${VAR_SETUP_PATH}/includes/etc/skel/.zshrc" "${TARGET}/etc/skel/.zshrc"
-  install -D -m 0644 -o root -g root "${VAR_SETUP_PATH}/includes/root/.ciss/shortcuts" "${TARGET}/etc/skel/.ciss/"
+  install -m 0644 -o root -g root "${VAR_SETUP_PATH}/includes/root/.ciss/alias" "${TARGET}/etc/skel/.ciss/alias"
+  install -m 0644 -o root -g root "${VAR_SETUP_PATH}/includes/root/.ciss/clean_logout.sh" "${TARGET}/etc/skel/.ciss/clean_logout.sh"
+  install -m 0644 -o root -g root "${VAR_SETUP_PATH}/includes/root/.ciss/shortcuts" "${TARGET}/etc/skel/.ciss/shortcuts"
 
   ### In order to be able to copy/paste from vim, one needs to create a '.vimrc' in every home directory with the following content:
   echo 'set clipboard=unnamed' >| "${TARGET}/etc/skel/.vimrc"