V8.13.290.2025.10.26

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

scripts/9999-cdi-starter

@@ -13,21 +13,72 @@
 set -Ceuo pipefail
 umask 0077
 
+declare -grx  VAR_SEMAPHORE="/root/cdi.ciss" # Semaphore to appear.
+declare -girx VAR_TIMEOUT=60                 # Semaphore timer in seconds.
+
 install -d -m 0755 /run/lock
 exec 9> /run/lock/9999-cdi-starter.lock
 flock -n 9 || { echo "9999-cdi-starter already running. Exiting."; exit 0; }
 
 #######################################
-# Wait for network connectivity by looping.
+# Call into the CISS.debian.installer once the semaphore file is present.
+# Globals:
+#   None
 # Arguments:
 #   None
+# Returns:
+#   0: on success
+#######################################
+cdi() {
+  ### Declare Arrays, HashMaps, and Variables.
+  declare -i rc=""
+
+  ./ciss_debian_installer.sh \
+    --autoinstall \
+    --debug XTRACE \
+    --log debug \
+    --reionice-priority 1 0 \
+    --renice-priority "-19" \
+
+  rc="$?"
+
+  if [[ "${rc}" -eq 0 ]]; then
+
+    logger -t cdi-watcher "cdi(): ciss_debian_installer.sh completed SUCCESSFULLY [${rc}]."
+    exit 0
+
+  else
+
+    logger -t cdi-watcher "cdi(): ciss_debian_installer.sh FAILED [${rc}]."
+    exit "${rc}"
+
+  fi
+}
+### Prevents accidental 'unset -f'.
+# shellcheck disable=SC2034
+readonly -f cdi
+
+#######################################
+# Wait for network connectivity by looping.
+# Globals:
+#   None
+# Arguments:
+#   None
+# Returns:
+#   0: on success
 #######################################
 net_wait() {
+  ### Declare Arrays, HashMaps, and Variables.
   declare -i i=1
+
   for i in {1..30}; do
+
     getent hosts git.coresecret.dev >/dev/null && break
     sleep 1
+
   done
+
+  return 0
 }
 ### Prevents accidental 'unset -f'.
 # shellcheck disable=SC2034
@@ -35,13 +86,20 @@ readonly -f net_wait
 
 #######################################
 # Wrapper for loading CISS hardened Kernel Parameters.
+# Globals:
+#   None
 # Arguments:
 #   None
+# Returns:
+#   0: on success
 #######################################
 sysp() {
   sysctl -p /etc/sysctl.d/99_local.hardened
+
   # shellcheck disable=SC2312
   sysctl -a | grep -E 'kernel|vm|net' >| /var/log/sysctl_check"$(date +"%Y-%m-%d_%H:%M:%S")".log
+
+  return 0
 }
 ### Prevents accidental 'unset -f'.
 # shellcheck disable=SC2034
@@ -53,41 +111,70 @@ readonly -f sysp
 #   None
 #######################################
 main() {
-  declare -r repo_url="https://git.coresecret.dev/msw/CISS.debian.installer.git"
-  declare -r repo_dir="/root/git/CISS.debian.installer"
+  ### Declare Arrays, HashMaps, and Variables.
+  declare -r var_repo_url="https://git.coresecret.dev/msw/CISS.debian.installer.git"
+  declare -r var_repo_dir="/root/git/CISS.debian.installer"
+  delcare -i i=""
+  declare    var_mode=""
 
+  ### Sleep a moment to settle boot artifacts.
   sleep 8
 
+  ### Harden Kernel parameters.
   sysp
 
+  ### Prepare logging.
   install -d -m 0700 /root/.ciss/cdi/log
   # shellcheck disable=SC2155
   declare -r log="/root/.ciss/cdi/log/9999-cdi-starter_$(date +'%F_%H-%M-%S').log"
   # shellcheck disable=SC2312
   exec > >(tee -a "${log}") 2>&1
 
-  printf "CISS.debian.installer Master V8.13.288.2025.10.24 is up! \n" >| /root/.ciss/cdi/log/auto_start_begin_"$(date +"%Y-%m-%d_%H-%M-%S")".log
+  printf "CISS.debian.installer Master V8.13.290.2025.10.26 is up! \n" >| /root/.ciss/cdi/log/auto_start_begin_"$(date +"%Y-%m-%d_%H-%M-%S")".log
 
+  ### Wait for network connectivity.
   net_wait
 
+  ### Download CISS.debian.installer.
   cd /root/git
 
-  [[ -d "${repo_dir}" ]] && rm -rf "${repo_dir}"
+  [[ -d "${var_repo_dir}" ]] && rm -rf "${var_repo_dir}"
 
-  git clone "${repo_url}" "${repo_dir}"
+  git clone "${var_repo_url}" "${var_repo_dir}"
 
-  chmod 0700 "${repo_dir}/ciss_debian_installer.sh"
+  chmod 0700 "${var_repo_dir}/ciss_debian_installer.sh"
 
-  cd "${repo_dir}"
+  cd "${var_repo_dir}"
 
-#./ciss_debian_installer.sh \
-#  --autoinstall \
-#  --debug XTRACE \
-#  --log debug \
-#  --reionice-priority 1 0 \
-#  --renice-priority "-19"
+  ### Poll up to VAR_TIMEOUT seconds for the semaphore to appear and be mode 0600.
+  for ((i=0; i<VAR_TIMEOUT; i++)); do
 
-  printf "CISS.debian.installer Master V8.13.288.2025.10.24 successfully executed! \n" >| /root/.ciss/cdi/log/auto_start_finished_"$(date +"%Y-%m-%d_%H-%M-%S")".log
+    if [[ -e "${VAR_SEMAPHORE}" && ! -s "${VAR_SEMAPHORE}" ]]; then
+
+      var_mode="$(stat -c '%a' -- "${VAR_SEMAPHORE}" 2>/dev/null || echo '?')"
+
+      if [[ "${var_mode}" == "600" ]]; then
+
+        logger -t cdi-watcher "Semaphore found (${VAR_SEMAPHORE}, mode 0600) after ${i}s -> invoking cdi()"
+
+        cdi
+        ### cdi() never returns (it exits the script), so no code below this point in the 'then'-block will run.
+
+      else
+
+        logger -t cdi-watcher "Semaphore ${VAR_SEMAPHORE} present but wrong mode ${var_mode} (expected 600); ignoring"
+
+      fi
+
+    fi
+
+    sleep 1
+
+  done
+
+  ### Timeout reached without acceptable semaphore.
+  logger -t cdi-watcher "No valid semaphore ${VAR_SEMAPHORE} (mode 0600) within ${TIMEOUT_SEC}s; exiting idle."
+  printf "CISS.debian.installer Master V8.13.290.2025.10.26: No valid semaphore [%s] within [%s]s.\n" "${VAR_SEMAPHORE}" "${VAR_TIMEOUT}" >| /root/.ciss/cdi/log/auto_start_finished_"$(date +"%Y-%m-%d_%H-%M-%S")".log
 
   exit 0
 }