V8.00.000.2025.06.17

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

lib/cdi_0110_interactive/0110_check_kernel.sh

@@ -10,39 +10,44 @@
 # SPDX-PackageName: CISS.debian.installer
 # SPDX-Security-Contact: security@coresecret.eu
 
-# TODO: Update this module
-
 guard_sourcing
 
 #######################################
-# Kernel Image Selector
+# Kernel Image Selector.
 # Globals:
-#   VAR_ARCHITECTURE
 #   VAR_KERNEL
 #   VAR_KERNEL_SRT
 #   VAR_KERNEL_TMP
 # Arguments:
-#  None
+#   None
 # Returns:
-#   42: Sorting Error.
+#   0: on success
+#   42: On sorting Error.
 #######################################
 check_kernel() {
-  clear
   declare -i counter=1
-  declare first_string=""
-  declare line=""
-  declare -gx VAR_KERNEL=""
-  declare name=""
-  declare options=""
+  declare    first_string="" line="" name="" options="" var_cpu_vendor=""
 
-  if [[ ${VAR_ARCHITECTURE} != arm64 ]]; then
-    apt-cache search linux-image | grep linux-image | grep amd64 | grep -v "meta-package" | grep -v "dbg" | grep -v "template" >> "${VAR_KERNEL_TMP}"
-  else
-    apt-cache search linux-image | grep linux-image | grep arm64 | grep -v "meta-package" | grep -v "dbg" | grep -v "template" >> "${VAR_KERNEL_TMP}"
-  fi
+  # shellcheck disable=SC2312
+  var_cpu_vendor=$(</proc/cpuinfo grep 'vendor_id' | head -n1 | cut -d: -f2 | xargs)
+
+  case "${var_cpu_vendor}" in
+
+    *AuthenticAMD*)
+      # shellcheck disable=SC2312
+      apt-cache search linux-image | grep linux-image | grep amd64 | grep -v "meta-package" | grep -v "dbg" | grep -v "template" >> "${VAR_KERNEL_TMP}"
+      ;;
+
+    *GenuineIntel*)
+      # shellcheck disable=SC2312
+      apt-cache search linux-image | grep linux-image | grep arm64 | grep -v "meta-package" | grep -v "dbg" | grep -v "template" >> "${VAR_KERNEL_TMP}"
+      ;;
+
+    *)                do_log "info" "file_only" "4140() Unknown or unsupported CPU vendor: '${var_cpu_vendor}', skipping." ;;
+  esac
 
   sort --output="${VAR_KERNEL_SRT}" "${VAR_KERNEL_TMP}" || {
-    printf "❌ Error check_kernel() Line 40 sort failed\n" >&2
+    printf "❌ Error 0110_check_kernel.sh Line 52 sort failed\n" >&2
     # shellcheck disable=SC2162
     read -p  $'\e[92m✅ Press \'ENTER\' to exit the script ... \e[0m'
     return 42
@@ -55,22 +60,23 @@ check_kernel() {
       ((counter++))
     done < "${VAR_KERNEL_SRT}"
 
-  # shellcheck disable=SC2155
-  if declare -g VAR_KERNEL=$(dialog \
+  # shellcheck disable=SC2034
+  if VAR_KERNEL=$(dialog \
                           --no-collapse \
                           --ascii-lines \
                           --clear \
-                          --backtitle "CISS.debian.live.builder" \
-                          --title "Select the Kernel for the CISS Hardened Debian Live Image ISO" \
+                          --backtitle "CISS.debian.installer powered by CoreSecret.eu" \
+                          --title "Select the Kernel for the CISS.debian.installer" \
                           --radiolist "Kernel available \n *+bpo*       : Debian Backported Kernel \n *cloud*      : Special lightweight images for KVM \n *unsigned*   : Unsigned Kernel \n *preempt_rt* : Special Kernel for real-time-computing \n Not unsigned marked are MS signed Kernel for Secure Boot \n" 0 0 "${options[@]}" 3>&1 1>&2 2>&3 3>&-); then
-    clear
+
+    do_log "info" "file_only" "0110() Kernel image selected interactively: '${VAR_KERNEL}'."
+
   else
-    clear
-    if [[ "${VAR_ARCHITECTURE}" == "amd64" ]]; then
-      declare -gr VAR_KERNEL="amd64"
-    elif [[ "${VAR_ARCHITECTURE}" == "arm64" ]]; then
-      declare -gr VAR_KERNEL="arm64"
-    fi
+
+    VAR_KERNEL=""
+
   fi
+
+  return 0
 }
 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh