V8.00.000.2025.06.17
All checks were successful
🛡️ Shell Script Linting / 🛡️ Shell Script Linting (push) Successful in 1m1s
All checks were successful
🛡️ Shell Script Linting / 🛡️ Shell Script Linting (push) Successful in 1m1s
Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
@@ -64,21 +64,21 @@ update_grub() {
|
||||
|
||||
amd64)
|
||||
do_in_target_script "${TARGET}" "
|
||||
apt-get install -y --no-install-recommends -t bookworm-backports grub2 grub2-common grub-efi-amd64 2>&1 | tee -a ${var_logfile}
|
||||
apt-get install -y --no-install-recommends -t bookworm-backports grub2 grub2-common grub-efi-amd64 grub-efi-amd64-bin 2>&1 | tee -a ${var_logfile}
|
||||
echo ExitCode: \$? >> ${var_logfile}
|
||||
"
|
||||
;;
|
||||
|
||||
arm64)
|
||||
do_in_target_script "${TARGET}" "
|
||||
apt-get install -y --no-install-recommends -t bookworm-backports grub2 grub2-common grub-efi-arm64 2>&1 | tee -a ${var_logfile}
|
||||
apt-get install -y --no-install-recommends -t bookworm-backports grub2 grub2-common grub-efi-arm64 grub-efi-arm64-bin 2>&1 | tee -a ${var_logfile}
|
||||
echo ExitCode: \$? >> ${var_logfile}
|
||||
"
|
||||
;;
|
||||
|
||||
i386)
|
||||
do_in_target_script "${TARGET}" "
|
||||
apt-get install -y --no-install-recommends -t bookworm-backports grub2 grub2-common grub-efi-ia32 2>&1 | tee -a ${var_logfile}
|
||||
apt-get install -y --no-install-recommends -t bookworm-backports grub2 grub2-common grub-efi-ia32 grub-efi-ia32-bin 2>&1 | tee -a ${var_logfile}
|
||||
echo ExitCode: \$? >> ${var_logfile}
|
||||
"
|
||||
;;
|
||||
@@ -92,7 +92,7 @@ update_grub() {
|
||||
else
|
||||
|
||||
do_in_target_script "${TARGET}" "
|
||||
apt-get install -y --no-install-recommends -t bookworm-backports grub2 grub2-common grub-pc 2>&1 | tee -a ${var_logfile}
|
||||
apt-get install -y --no-install-recommends -t bookworm-backports grub2 grub2-common grub-pc grub-pc-bin 2>&1 | tee -a ${var_logfile}
|
||||
echo ExitCode: \$? >> ${var_logfile}
|
||||
"
|
||||
|
||||
@@ -104,15 +104,15 @@ update_grub() {
|
||||
if [[ "${VAR_RECIPE_FIRMWARE}" == "uefi" ]]; then
|
||||
|
||||
case "${VAR_ARCHITECTURE,,}" in
|
||||
amd64) do_in_target "${TARGET}" apt-get install -y --no-install-recommends grub2 grub2-common grub-efi-amd64 ;;
|
||||
arm64) do_in_target "${TARGET}" apt-get install -y --no-install-recommends grub2 grub2-common grub-efi-arm64 ;;
|
||||
i386) do_in_target "${TARGET}" apt-get install -y --no-install-recommends grub2 grub2-common grub-efi-ia32 ;;
|
||||
amd64) do_in_target "${TARGET}" apt-get install -y --no-install-recommends grub2 grub2-common grub-efi-amd64 grub-efi-amd64-bin ;;
|
||||
arm64) do_in_target "${TARGET}" apt-get install -y --no-install-recommends grub2 grub2-common grub-efi-arm64 grub-efi-arm64-bin ;;
|
||||
i386) do_in_target "${TARGET}" apt-get install -y --no-install-recommends grub2 grub2-common grub-efi-ia32 grub-efi-ia32-bin ;;
|
||||
*) do_log "emergency" "file_only" "4230() Unsupported UEFI architecture: ${VAR_ARCHITECTURE}"; return "${ERR_GRUB_ARCHITECTURE}" ;;
|
||||
esac
|
||||
|
||||
else
|
||||
|
||||
do_in_target "${TARGET}" apt-get install -y --no-install-recommends grub2 grub2-common grub-pc
|
||||
do_in_target "${TARGET}" apt-get install -y --no-install-recommends grub2 grub2-common grub-pc grub-pc-bin
|
||||
|
||||
fi
|
||||
|
||||
|
||||
@@ -26,6 +26,6 @@ color_echo() {
|
||||
declare c="$1"
|
||||
shift
|
||||
declare msg="${*}"
|
||||
printf "%b[INFO]%b %b%s %b%b" "${c}" "${RES}" "${WHI}" "${msg}" "${RES}" "${NL}"
|
||||
printf "%b[INFO]%b %b%s %b%b" "${c}" "${RES}" "${WHI}" "${msg}" "${RES}" "${NL}" | tee -a "${VAR_DIALOG}"
|
||||
}
|
||||
# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh
|
||||
|
||||
@@ -64,8 +64,6 @@ check_kernel() {
|
||||
((counter++))
|
||||
done < "${VAR_KERNEL_SRT}"
|
||||
|
||||
tput smcup
|
||||
|
||||
# shellcheck disable=SC2034
|
||||
if VAR_KERNEL=$(dialog \
|
||||
--no-collapse \
|
||||
@@ -74,20 +72,23 @@ check_kernel() {
|
||||
--help-button --help-label "Info" \
|
||||
--backtitle "CISS.debian.installer" \
|
||||
--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
|
||||
--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>&-)
|
||||
|
||||
#clear
|
||||
then
|
||||
|
||||
clear
|
||||
[[ "${VAR_KERNEL}" != linux-image-* ]] && VAR_KERNEL="linux-image-${VAR_KERNEL}"
|
||||
do_log "info" "file_only" "0110() Kernel image selected interactively: '${VAR_KERNEL}'."
|
||||
|
||||
else
|
||||
|
||||
#clear
|
||||
clear
|
||||
VAR_KERNEL=""
|
||||
|
||||
fi
|
||||
|
||||
tput rmcup
|
||||
# shellcheck disable=SC2312
|
||||
cat "${VAR_DIALOG}" | tail -n 30
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
@@ -14,6 +14,8 @@ guard_sourcing
|
||||
|
||||
### Definition of MUST set global variables.
|
||||
|
||||
# shellcheck disable=SC2155
|
||||
declare -grx VAR_DIALOG=$(mktemp var_dialog.XXXXXXXX)
|
||||
# shellcheck disable=SC2155
|
||||
declare -grx VAR_KERNEL_INF=$(mktemp var_kernel_inf.XXXXXXXX)
|
||||
# shellcheck disable=SC2155
|
||||
|
||||
Reference in New Issue
Block a user