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 53s
Details

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

149
func/cdi_1000_helper/1081_helper_grub.sh
View File

@@ -29,7 +29,7 @@ declare -grx VAR_H='"'
# Arguments:
# None
#######################################
grub_extract_current_string() {
old_grub_extract_current_string() {
# shellcheck disable=SC2155
declare -gx VAR_ORIG_GRUB_CMDLINE_LINUX=$(grep -E 'GRUB_CMDLINE_LINUX=' "${TARGET}/etc/default/grub")
# shellcheck disable=SC2155
@@ -40,6 +40,151 @@ grub_extract_current_string() {
declare -gx VAR_GRUB_CMDLINE_LINUX_DEFAULT=$(grep -E 'GRUB_CMDLINE_LINUX_DEFAULT=' "${TARGET}/etc/default/grub" | sed 's/.$//')
}
#######################################
# description
# Globals:
# TARGET
# VAR_ORIG_GRUB_CMDLINE_LINUX
# VAR_ORIG_GRUB_CMDLINE_LINUX_DEFAULT
# VK_GRUB_CMDLINE_LINUX
# VK_GRUB_CMDLINE_LINUX_DEFAULT
# VV_GRUB_CMDLINE_LINUX
# VV_GRUB_CMDLINE_LINUX_DEFAULT
# Arguments:
# None
# Returns:
# 0: on success
#######################################
grub_extract_current_string() {
### Declare Arrays, HashMaps, and Variables.
declare -gx VAR_ORIG_GRUB_CMDLINE_LINUX="" VAR_ORIG_GRUB_CMDLINE_LINUX_DEFAULT="" \
VK_GRUB_CMDLINE_LINUX='' VK_GRUB_CMDLINE_LINUX_DEFAULT='' \
VV_GRUB_CMDLINE_LINUX="" VV_GRUB_CMDLINE_LINUX_DEFAULT=""
declare vv_raw_lin="" vv_raw_lin_def=""
### Original lines (retained, strictly anchored).
VAR_ORIG_GRUB_CMDLINE_LINUX=$(grep -E '^GRUB_CMDLINE_LINUX=' "${TARGET}/etc/default/grub")
VAR_ORIG_GRUB_CMDLINE_LINUX_DEFAULT=$(grep -E '^GRUB_CMDLINE_LINUX_DEFAULT=' "${TARGET}/etc/default/grub")
### Keys (fixed prefixes).
VK_GRUB_CMDLINE_LINUX='GRUB_CMDLINE_LINUX='
VK_GRUB_CMDLINE_LINUX_DEFAULT='GRUB_CMDLINE_LINUX_DEFAULT='
### Raw values (with quotes if necessary).
# shellcheck disable=SC2295
vv_raw_lin="${VAR_ORIG_GRUB_CMDLINE_LINUX#${VK_GRUB_CMDLINE_LINUX}}"
# shellcheck disable=SC2295
vv_raw_lin_def="${VAR_ORIG_GRUB_CMDLINE_LINUX_DEFAULT#${VK_GRUB_CMDLINE_LINUX_DEFAULT}}"
### Remove outer quotes symmetrically.
if [[ -n ${vv_raw_lin} ]]; then
declare q="${vv_raw_lin:0:1}"
if [[ ${q} == "'" || ${q} == '"' ]]; then
[[ ${vv_raw_lin: -1} == "${q}" ]] && vv_raw_lin=${vv_raw_lin:1:-1} || vv_raw_lin=${vv_raw_lin:1}
fi
fi
if [[ -n ${vv_raw_lin_def} ]]; then
declare q="${vv_raw_lin_def:0:1}"
if [[ ${q} == "'" || ${q} == '"' ]]; then
[[ ${vv_raw_lin_def: -1} == "${q}" ]] && vv_raw_lin_def=${vv_raw_lin_def:1:-1} || vv_raw_lin_def=${vv_raw_lin_def:1}
fi
fi
### Trim leading and trailing whitespace (including TAB, CR, and LF).
### Front: remove the longest prefix from whitespace.
vv_raw_lin="${vv_raw_lin#"${vv_raw_lin%%[![:space:]]*}"}"
vv_raw_lin_def="${vv_raw_lin_def#"${vv_raw_lin_def%%[![:space:]]*}"}"
### Rear: remove the longest suffix from whitespaces.
vv_raw_lin="${vv_raw_lin%"${vv_raw_lin##*[![:space:]]}"}"
vv_raw_lin_def="${vv_raw_lin_def%"${vv_raw_lin_def##*[![:space:]]}"}"
### Expose end values (only value, without quotes, trimmed)
# shellcheck disable=SC2034
VV_GRUB_CMDLINE_LINUX="${vv_raw_lin}"
# shellcheck disable=SC2034
VV_GRUB_CMDLINE_LINUX_DEFAULT="${vv_raw_lin_def}"
return 0
}
#######################################
# description
# Globals:
# TARGET
# VAR_GRUB_CMDLINE_LINUX
# VAR_GRUB_CMDLINE_LINUX_DEFAULT
# VK_GRUB_CMDLINE_LINUX
# VK_GRUB_CMDLINE_LINUX_DEFAULT
# VV_GRUB_CMDLINE_LINUX
# VV_GRUB_CMDLINE_LINUX_DEFAULT
# Arguments:
# None
# Returns:
# 0 ...
#######################################
grub_finalize_string() {
### Declare Arrays, HashMaps, and Variables.
declare -a ary_lines=()
declare var_file="${TARGET}/etc/default/grub"
declare var_new_lin="${VK_GRUB_CMDLINE_LINUX}'${VV_GRUB_CMDLINE_LINUX}'"
declare var_new_lin_def="${VK_GRUB_CMDLINE_LINUX_DEFAULT}'${VV_GRUB_CMDLINE_LINUX_DEFAULT}'"
declare -i var_found_lin=0 var_found_lin_def=0 var_line=0 i=0
mapfile -t ary_lines < "${var_file}"
### Replace lines strictly based on the key (including '=').
for (( i=0; i<${#ary_lines[@]}; i++ )); do
var_line=${ary_lines[i]}
case "${var_line}" in
"${VK_GRUB_CMDLINE_LINUX}"*)
ary_lines[i]="${var_new_lin}"
var_found_lin=1
;;
"${VK_GRUB_CMDLINE_LINUX_DEFAULT}"*)
ary_lines[i]="${var_new_lin_def}"
var_found_lin_def=1
;;
esac
done
### If Key is missing in the file, add it at the end (robust against minimal templates).
(( var_found_lin == 0 )) && ary_lines+=("${var_new_lin}")
(( var_found_lin_def == 0 )) && ary_lines+=("${var_new_lin_def}")
### Write back (without sed/awk, only built-ins).
{
for var_line in "${ary_lines[@]}"; do
printf '%s\n' "${var_line}"
done
} >| "${var_file}"
### For subsequent use, export the complete lines as well.
declare -gx VAR_GRUB_CMDLINE_LINUX="${var_new_lin}"
declare -gx VAR_GRUB_CMDLINE_LINUX_DEFAULT="${var_new_lin_def}"
return 0
}
#######################################
# Helper module to finish the modified GRUB CMDLINE strings.
# Globals:
@@ -52,7 +197,7 @@ grub_extract_current_string() {
# Arguments:
# None
#######################################
grub_finalize_string() {
old_grub_finalize_string() {
declare var_grub_cmdline_linux="" var_grub_cmdline_linux_default=""
var_grub_cmdline_linux="${VAR_GRUB_CMDLINE_LINUX}${VAR_H}"

29
func/cdi_4200_boot/4250_update_grub_bootparameter.sh
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
}