V8.00.000.2025.06.17
All checks were successful
🛡️ Shell Script Linting / 🛡️ Shell Script Linting (push) Successful in 50s
All checks were successful
🛡️ Shell Script Linting / 🛡️ Shell Script Linting (push) Successful in 50s
Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
@@ -19,28 +19,6 @@ guard_sourcing
|
||||
# Helper module to extract the current GRUB CMDLINE strings.
|
||||
# Globals:
|
||||
# TARGET
|
||||
# VAR_GRUB_CMDLINE_LINUX
|
||||
# VAR_GRUB_CMDLINE_LINUX_DEFAULT
|
||||
# VAR_ORIG_GRUB_CMDLINE_LINUX
|
||||
# VAR_ORIG_GRUB_CMDLINE_LINUX_DEFAULT
|
||||
# Arguments:
|
||||
# None
|
||||
#######################################
|
||||
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
|
||||
declare -gx VAR_ORIG_GRUB_CMDLINE_LINUX_DEFAULT=$(grep -E 'GRUB_CMDLINE_LINUX_DEFAULT=' "${TARGET}/etc/default/grub")
|
||||
# shellcheck disable=SC2155
|
||||
declare -gx VAR_GRUB_CMDLINE_LINUX=$(grep -E 'GRUB_CMDLINE_LINUX=' "${TARGET}/etc/default/grub" | sed 's/.$//')
|
||||
# shellcheck disable=SC2155
|
||||
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
|
||||
@@ -49,6 +27,8 @@ old_grub_extract_current_string() {
|
||||
# VV_GRUB_CMDLINE_LINUX_DEFAULT
|
||||
# Arguments:
|
||||
# None
|
||||
# Returns:
|
||||
# 0: on success
|
||||
#######################################
|
||||
grub_extract_current_string() {
|
||||
### Declare Arrays, HashMaps, and Variables.
|
||||
@@ -61,31 +41,19 @@ grub_extract_current_string() {
|
||||
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")
|
||||
|
||||
# TODO REMOVE DEBUG LOGGER
|
||||
do_log "debug" "file_only" "1081() Value of VAR_ORIG_GRUB_CMDLINE_LINUX: [${VAR_ORIG_GRUB_CMDLINE_LINUX}]."
|
||||
do_log "debug" "file_only" "1081() Value of VAR_ORIG_GRUB_CMDLINE_LINUX_DEFAULT: [${VAR_ORIG_GRUB_CMDLINE_LINUX_DEFAULT}]."
|
||||
# TODO REMOVE DEBUG LOGGER
|
||||
do_log "debug" "file_only" "1081() VAR_ORIG_GRUB_CMDLINE_LINUX: [${VAR_ORIG_GRUB_CMDLINE_LINUX}]."
|
||||
do_log "debug" "file_only" "1081() VAR_ORIG_GRUB_CMDLINE_LINUX_DEFAULT: [${VAR_ORIG_GRUB_CMDLINE_LINUX_DEFAULT}]."
|
||||
|
||||
### Keys (fixed prefixes).
|
||||
VK_GRUB_CMDLINE_LINUX='GRUB_CMDLINE_LINUX='
|
||||
VK_GRUB_CMDLINE_LINUX_DEFAULT='GRUB_CMDLINE_LINUX_DEFAULT='
|
||||
|
||||
# TODO REMOVE DEBUG LOGGER
|
||||
do_log "debug" "file_only" "1081() Value of VK_GRUB_CMDLINE_LINUX: [${VK_GRUB_CMDLINE_LINUX}]."
|
||||
do_log "debug" "file_only" "1081() Value of VK_GRUB_CMDLINE_LINUX_DEFAULT: [${VK_GRUB_CMDLINE_LINUX_DEFAULT}]."
|
||||
# TODO REMOVE DEBUG LOGGER
|
||||
|
||||
### 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}}"
|
||||
|
||||
# TODO REMOVE DEBUG LOGGER
|
||||
do_log "debug" "file_only" "1081() Value of vv_raw_lin: [${vv_raw_lin}]."
|
||||
do_log "debug" "file_only" "1081() Value of vv_raw_lin_def: [${vv_raw_lin_def}]."
|
||||
# TODO REMOVE DEBUG LOGGER
|
||||
|
||||
### Remove outer quotes symmetrically.
|
||||
if [[ -n ${vv_raw_lin} ]]; then
|
||||
|
||||
@@ -124,10 +92,15 @@ grub_extract_current_string() {
|
||||
VV_GRUB_CMDLINE_LINUX="${vv_raw_lin}"
|
||||
# shellcheck disable=SC2034
|
||||
VV_GRUB_CMDLINE_LINUX_DEFAULT="${vv_raw_lin_def}"
|
||||
|
||||
do_log "debug" "file_only" "1081() VV_GRUB_CMDLINE_LINUX: [${VV_GRUB_CMDLINE_LINUX}]."
|
||||
do_log "debug" "file_only" "1081() VV_GRUB_CMDLINE_LINUX_DEFAULT: [${VV_GRUB_CMDLINE_LINUX_DEFAULT}]."
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
#######################################
|
||||
# description
|
||||
# Helper module to finish the modified GRUB CMDLINE strings.
|
||||
# Globals:
|
||||
# TARGET
|
||||
# VAR_GRUB_CMDLINE_LINUX
|
||||
@@ -137,91 +110,50 @@ grub_extract_current_string() {
|
||||
# VV_GRUB_CMDLINE_LINUX
|
||||
# VV_GRUB_CMDLINE_LINUX_DEFAULT
|
||||
# Arguments:
|
||||
# None
|
||||
# None
|
||||
# Returns:
|
||||
# 0: on success
|
||||
#######################################
|
||||
grub_finalize_string() {
|
||||
### Declare Arrays, HashMaps, and Variables.
|
||||
declare -a ary_out=()
|
||||
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
|
||||
declare var_file="${TARGET}/etc/default/grub.d/99-ciss-cmdline.cfg"
|
||||
declare var_linux="${VV_GRUB_CMDLINE_LINUX//\'/\'\"\'\"\'}"
|
||||
declare var_linux_default="${VV_GRUB_CMDLINE_LINUX_DEFAULT//\'/\'\"\'\"\'}"
|
||||
declare -gx VAR_GRUB_CMDLINE_LINUX="${VK_GRUB_CMDLINE_LINUX}'${VV_GRUB_CMDLINE_LINUX}'"
|
||||
declare -gx VAR_GRUB_CMDLINE_LINUX_DEFAULT="${VK_GRUB_CMDLINE_LINUX_DEFAULT}'${VV_GRUB_CMDLINE_LINUX_DEFAULT}'"
|
||||
|
||||
# TODO REMOVE DEBUG LOGGER
|
||||
do_log "debug" "file_only" "1081() var_new_lin [${var_new_lin}]."
|
||||
do_log "debug" "file_only" "1081() var_new_lin [${var_new_lin_def}]."
|
||||
do_log "debug" "file_only" "1081() Before [mapfile -t ary_lines < ${var_file}]."
|
||||
# TODO REMOVE DEBUG LOGGER
|
||||
mkdir -p "${TARGET}/etc/default/grub.d"
|
||||
|
||||
### Read file line by line; robust against missing a final newline.
|
||||
while IFS= read -r var_line || [[ -n "${var_line}" ]]; do
|
||||
cat << EOF >| "${var_file}"
|
||||
# SPDX-Version: 3.0
|
||||
# SPDX-CreationInfo: 2025-06-17; WEIDNER, Marc S.; <msw@coresecret.dev>
|
||||
# SPDX-ExternalRef: GIT https://git.coresecret.dev/msw/CISS.debian.installer.git
|
||||
# SPDX-FileContributor: WEIDNER, Marc S.; Centurion Intelligence Consulting Agency
|
||||
# SPDX-FileCopyrightText: 2024-2025; WEIDNER, Marc S.; <msw@coresecret.dev>
|
||||
# SPDX-FileType: SOURCE
|
||||
# SPDX-License-Identifier: EUPL-1.2 OR LicenseRef-CCLA-1.0
|
||||
# SPDX-LicenseComment: This file is part of the CISS.debian.installer.secure framework.
|
||||
# SPDX-PackageName: CISS.debian.installer
|
||||
# SPDX-Security-Contact: security@coresecret.eu
|
||||
|
||||
case "${var_line}" in
|
||||
### Options in "GRUB_CMDLINE_LINUX" are always effective.
|
||||
### Options in "GRUB_CMDLINE_LINUX_DEFAULT" are effective ONLY during normal boot (NOT during recovery mode).
|
||||
|
||||
"${VK_GRUB_CMDLINE_LINUX}"*)
|
||||
EOF
|
||||
|
||||
ary_out+=("${var_new_lin}")
|
||||
var_found_lin=1
|
||||
;;
|
||||
insert_comments "${TARGET}/etc/default/grub.d/99-ciss-cmdline.cfg"
|
||||
|
||||
"${VK_GRUB_CMDLINE_LINUX_DEFAULT}"*)
|
||||
|
||||
ary_out+=("${var_new_lin_def}")
|
||||
var_found_lin_def=1
|
||||
;;
|
||||
|
||||
*)
|
||||
ary_out+=("${var_line}")
|
||||
;;
|
||||
|
||||
esac
|
||||
|
||||
done < "${var_file}"
|
||||
|
||||
### If Key is missing in the file, add it at the end (robust against minimal templates).
|
||||
(( var_found_lin == 0 )) && ary_out+=( "${var_new_lin}" )
|
||||
(( var_found_lin_def == 0 )) && ary_out+=( "${var_new_lin_def}" )
|
||||
|
||||
### Write back (without sed/awk, only built-ins).
|
||||
umask 0022
|
||||
{
|
||||
for var_line in "${ary_out[@]}"; do
|
||||
printf '%s\n' "${var_line}"
|
||||
done
|
||||
} >| "${var_file}"
|
||||
printf "GRUB_CMDLINE_LINUX='%s'\n" "${var_linux}"
|
||||
printf "GRUB_CMDLINE_LINUX_DEFAULT='%s'\n" "${var_linux_default}"
|
||||
printf "\n"
|
||||
printf "# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh\n"
|
||||
} >> "${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}"
|
||||
do_log "debug" "file_only" "1081() [${VAR_GRUB_CMDLINE_LINUX}]."
|
||||
do_log "debug" "file_only" "1081() [${VAR_GRUB_CMDLINE_LINUX_DEFAULT}]."
|
||||
|
||||
# TODO REMOVE DEBUG LOGGER
|
||||
do_log "debug" "file_only" "1081() VAR_GRUB_CMDLINE_LINUX [${VAR_GRUB_CMDLINE_LINUX}]."
|
||||
do_log "debug" "file_only" "1081() VAR_GRUB_CMDLINE_LINUX_DEFAULT [${VAR_GRUB_CMDLINE_LINUX_DEFAULT}]."
|
||||
# TODO REMOVE DEBUG LOGGER
|
||||
}
|
||||
|
||||
|
||||
#######################################
|
||||
# Helper module to finish the modified GRUB CMDLINE strings.
|
||||
# Globals:
|
||||
# TARGET
|
||||
# VAR_GRUB_CMDLINE_LINUX
|
||||
# VAR_GRUB_CMDLINE_LINUX_DEFAULT
|
||||
# VAR_H
|
||||
# VAR_ORIG_GRUB_CMDLINE_LINUX
|
||||
# VAR_ORIG_GRUB_CMDLINE_LINUX_DEFAULT
|
||||
# Arguments:
|
||||
# None
|
||||
#######################################
|
||||
old_grub_finalize_string() {
|
||||
declare var_grub_cmdline_linux="" var_grub_cmdline_linux_default=""
|
||||
|
||||
var_grub_cmdline_linux="${VAR_GRUB_CMDLINE_LINUX}${VAR_H}"
|
||||
var_grub_cmdline_linux_default="${VAR_GRUB_CMDLINE_LINUX_DEFAULT}${VAR_H}"
|
||||
|
||||
VAR_GRUB_CMDLINE_LINUX=$(printf '%s' "${var_grub_cmdline_linux}" | sed -e 's/[\/&\$]/\\&/g' )
|
||||
VAR_GRUB_CMDLINE_LINUX_DEFAULT=$(printf '%s' "${var_grub_cmdline_linux_default}" | sed -e 's/[\/&\$]/\\&/g' )
|
||||
|
||||
sed -i "s|${VAR_ORIG_GRUB_CMDLINE_LINUX}|${VAR_GRUB_CMDLINE_LINUX}|" "${TARGET}/etc/default/grub"
|
||||
sed -i "s|${VAR_ORIG_GRUB_CMDLINE_LINUX_DEFAULT}|${VAR_GRUB_CMDLINE_LINUX_DEFAULT}|" "${TARGET}/etc/default/grub"
|
||||
return 0
|
||||
}
|
||||
# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh
|
||||
|
||||
Reference in New Issue
Block a user