msw/CISS.debian.installer
SHA256
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V8.00.000.2025.06.17
All checks were successful
🛡️ Shell Script Linting / 🛡️ Shell Script Linting (push) Successful in 1m1s
Details

Browse Source 
Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
Marc S. Weidner
2025-08-06 08:11:03 +02:00
parent 5c0cbb74d7
commit c042596b52
4 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
func/cdi_4200_boot/4230_update_grub.sh
View File

@@ -64,21 +64,21 @@ update_grub() {
amd64) amd64)
do_in_target_script "${TARGET}" " 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} echo ExitCode: \$? >> ${var_logfile}
" "
;; ;;
arm64) arm64)
do_in_target_script "${TARGET}" " 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} echo ExitCode: \$? >> ${var_logfile}
" "
;; ;;
i386) i386)
do_in_target_script "${TARGET}" " 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} echo ExitCode: \$? >> ${var_logfile}
" "
;; ;;
@@ -92,7 +92,7 @@ update_grub() {
else else
do_in_target_script "${TARGET}" " 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} echo ExitCode: \$? >> ${var_logfile}
" "
@@ -104,15 +104,15 @@ update_grub() {
if [[ "${VAR_RECIPE_FIRMWARE}" == "uefi" ]]; then if [[ "${VAR_RECIPE_FIRMWARE}" == "uefi" ]]; then
case "${VAR_ARCHITECTURE,,}" in case "${VAR_ARCHITECTURE,,}" in
amd64) do_in_target "${TARGET}" apt-get install -y --no-install-recommends grub2 grub2-common grub-efi-amd64 ;; 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 ;; 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 ;; 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}" ;; *) do_log "emergency" "file_only" "4230() Unsupported UEFI architecture: ${VAR_ARCHITECTURE}"; return "${ERR_GRUB_ARCHITECTURE}" ;;
esac esac
else 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 fi
@@ -228,13 +228,13 @@ install_grub_bios() {
declare var_bios_mod="" declare var_bios_mod=""
### Cryptographic modules. ### Cryptographic modules.
var_bios_mod+="cryptodisk gcry_rijndael gcry_sha256 gcry_sha512 gcry_whirlpool gcry_serpent gcry_twofish luks luks2" var_bios_mod+="cryptodisk gcry_rijndael gcry_sha256 gcry_sha512 gcry_whirlpool gcry_serpent gcry_twofish luks luks2 "
### Filesystem modules. ### Filesystem modules.
var_bios_mod+="btrfs ext2" var_bios_mod+="btrfs ext2 "
### Partitioning / Device / GPT ### Partitioning / Device / GPT
var_bios_mod+="biosdisk mdraid1x part_gpt" var_bios_mod+="biosdisk mdraid1x part_gpt "
### Device / Terminal modules. ### Device / Terminal modules.
var_bios_mod+="boot linux efi_gop efi_uga gfxterm gfxterm_background gfxterm_menu normal search search_fs_uuid search_label" var_bios_mod+="boot linux efi_gop efi_uga gfxterm gfxterm_background gfxterm_menu normal search search_fs_uuid search_label "
### Debug modules. ### Debug modules.
var_bios_mod+="cat echo hexdump ls test terminfo" var_bios_mod+="cat echo hexdump ls test terminfo"
@@ -264,7 +264,7 @@ install_grub_bios() {
install_grub_uefi() { install_grub_uefi() {
### Declare Arrays, HashMaps, and Variables. ### Declare Arrays, HashMaps, and Variables.
declare -a ary_uefi_arg=() declare -a ary_uefi_arg=()
declare var_uefi_mod=" " declare var_uefi_mod=""
### Cryptographic modules. ### Cryptographic modules.
var_uefi_mod+="cryptodisk gcry_rijndael gcry_sha256 gcry_sha512 gcry_whirlpool gcry_serpent gcry_twofish luks luks2 " var_uefi_mod+="cryptodisk gcry_rijndael gcry_sha256 gcry_sha512 gcry_whirlpool gcry_serpent gcry_twofish luks luks2 "

2
lib/cdi_0010_basic/0010_color_echo.sh
View File

@@ -26,6 +26,6 @@ color_echo() {
declare c="$1" declare c="$1"
shift shift
declare msg="${*}" 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 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

13
lib/cdi_0110_interactive/0110_check_kernel.sh
View File

@@ -64,8 +64,6 @@ check_kernel() {
((counter++)) ((counter++))
done < "${VAR_KERNEL_SRT}" done < "${VAR_KERNEL_SRT}"
tput smcup
# shellcheck disable=SC2034 # shellcheck disable=SC2034
if VAR_KERNEL=$(dialog \ if VAR_KERNEL=$(dialog \
--no-collapse \ --no-collapse \
@@ -74,20 +72,23 @@ check_kernel() {
--help-button --help-label "Info" \ --help-button --help-label "Info" \
--backtitle "CISS.debian.installer" \ --backtitle "CISS.debian.installer" \
--title "Select the Kernel for the 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}" [[ "${VAR_KERNEL}" != linux-image-* ]] && VAR_KERNEL="linux-image-${VAR_KERNEL}"
do_log "info" "file_only" "0110() Kernel image selected interactively: '${VAR_KERNEL}'." do_log "info" "file_only" "0110() Kernel image selected interactively: '${VAR_KERNEL}'."
else else
#clear clear
VAR_KERNEL="" VAR_KERNEL=""
fi fi
tput rmcup # shellcheck disable=SC2312
cat "${VAR_DIALOG}" | tail -n 30
return 0 return 0
} }

2
var/global.var.sh
View File

@@ -14,6 +14,8 @@ guard_sourcing
### Definition of MUST set global variables. ### Definition of MUST set global variables.
# shellcheck disable=SC2155
declare -grx VAR_DIALOG=$(mktemp var_dialog.XXXXXXXX)
# shellcheck disable=SC2155 # shellcheck disable=SC2155
declare -grx VAR_KERNEL_INF=$(mktemp var_kernel_inf.XXXXXXXX) declare -grx VAR_KERNEL_INF=$(mktemp var_kernel_inf.XXXXXXXX)
# shellcheck disable=SC2155 # shellcheck disable=SC2155