V8.00.000.2025.06.17
All checks were successful
🛡️ Shell Script Linting / 🛡️ Shell Script Linting (push) Successful in 53s

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
2025-08-08 08:57:14 +02:00
parent bb68afa439
commit 31c2c2ff89
2 changed files with 167 additions and 11 deletions

View File

@@ -35,9 +35,15 @@ update_grub_bootparameter() {
grub_extract_current_string
do_log "debug" "file_only" "VAR_GRUB_CMDLINE_LINUX: [${VAR_GRUB_CMDLINE_LINUX}]."
do_log "debug" "file_only" "VAR_GRUB_CMDLINE_LINUX_DEFAULT: [${VAR_GRUB_CMDLINE_LINUX_DEFAULT}]."
# TODO REMOVE DEBUG LOGGER
# shellcheck disable=SC2153
do_log "debug" "tty" "4250() Value of GRUB_CMDLINE_LINUX: [${VV_GRUB_CMDLINE_LINUX}]."
# shellcheck disable=SC2153
do_log "debug" "tty" "4250() Value of GRUB_CMDLINE_LINUX_DEFAULT: [${VV_GRUB_CMDLINE_LINUX_DEFAULT}]."
sleep 5
# TODO REMOVE DEBUG LOGGER
# shellcheck disable=SC2034
for var_param in "${ARY_BOOTPARAM[@]}"; do
if [[ -z "${var_param}" ]]; then
@@ -45,32 +51,37 @@ update_grub_bootparameter() {
continue
fi
if grep -qF -- "${var_param}" <<< "${VAR_GRUB_CMDLINE_LINUX_DEFAULT}"; then
if grep -qF -- "${var_param}" <<< "${VV_GRUB_CMDLINE_LINUX_DEFAULT}"; then
do_log "info" "file_only" "4250() Skipping duplicate kernel parameter: '${var_param}'."
continue
fi
VAR_GRUB_CMDLINE_LINUX_DEFAULT="${VAR_GRUB_CMDLINE_LINUX_DEFAULT} ${var_param}"
VV_GRUB_CMDLINE_LINUX_DEFAULT="${VV_GRUB_CMDLINE_LINUX_DEFAULT} ${var_param}"
done
if [[ "${VAR_DROPBEAR}" == "true" ]]; then
var_label="${HMP_PATH_ENCLABEL["/"]}"
VAR_GRUB_CMDLINE_LINUX="${VAR_GRUB_CMDLINE_LINUX:+${VAR_GRUB_CMDLINE_LINUX} }cryptdevice=${VAR_CRYPT_ROOT}:cryptroot root=/dev/mapper/${var_label}"
VV_GRUB_CMDLINE_LINUX="${VV_GRUB_CMDLINE_LINUX:+${VV_GRUB_CMDLINE_LINUX} }cryptdevice=${VAR_CRYPT_ROOT}:cryptroot root=/dev/mapper/${var_label}"
fi
if [[ "${VAR_NUKE}" == "true" ]]; then
var_nuke_string="nuke=${VAR_NUKE_HASH}"
# shellcheck disable=SC2034
VAR_GRUB_CMDLINE_LINUX="${VAR_GRUB_CMDLINE_LINUX} ${var_nuke_string}"
VV_GRUB_CMDLINE_LINUX="${VV_GRUB_CMDLINE_LINUX} ${var_nuke_string}"
fi
grub_finalize_string
do_in_target "${TARGET}" update-grub
# TODO REMOVE DEBUG LOGGER
# shellcheck disable=SC2153
do_log "debug" "tty" "4250() GRUB_CMDLINE_LINUX: [${VAR_GRUB_CMDLINE_LINUX}]."
# shellcheck disable=SC2153
do_log "debug" "tty" "4250() GRUB_CMDLINE_LINUX_DEFAULT: [${VAR_GRUB_CMDLINE_LINUX_DEFAULT}]."
sleep 5
# TODO REMOVE DEBUG LOGGER
do_log "info" "file_only" "4250() Setting GRUB_CMDLINE_LINUX_DEFAULT: [${VAR_GRUB_CMDLINE_LINUX_DEFAULT}]."
do_log "info" "file_only" "4250() Setting GRUB_CMDLINE_LINUX: [${VAR_GRUB_CMDLINE_LINUX}]."
do_in_target "${TARGET}" update-grub
guard_dir && return 0
}