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 3m11s
Details

Browse Source 
Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
Marc S. Weidner
2025-09-02 20:29:02 +02:00
parent 8e5e7a6515
commit d1ee062b43
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
func/cdi_1000_helper/1081_helper_grub.sh
View File

@@ -117,8 +117,8 @@ grub_extract_current_string() {
grub_finalize_string() { grub_finalize_string() {
### Declare Arrays, HashMaps, and Variables. ### Declare Arrays, HashMaps, and Variables.
declare var_file="${TARGET}/etc/default/grub.d/99-ciss-cmdline.cfg" declare var_file="${TARGET}/etc/default/grub.d/99-ciss-cmdline.cfg"
declare var_linux="${VV_GRUB_CMDLINE_LINUX//\'/\'\"\'\"\'}" #declare var_linux="${VV_GRUB_CMDLINE_LINUX//\'/\'\"\'\"\'}"
declare var_linux_default="${VV_GRUB_CMDLINE_LINUX_DEFAULT//\'/\'\"\'\"\'}" #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="${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}'" declare -gx VAR_GRUB_CMDLINE_LINUX_DEFAULT="${VK_GRUB_CMDLINE_LINUX_DEFAULT}'${VV_GRUB_CMDLINE_LINUX_DEFAULT}'"
@@ -134,9 +134,9 @@ EOF
umask 0022 umask 0022
{ {
printf 'GRUB_CMDLINE_LINUX="%s"\n' "${var_linux}" printf "GRUB_CMDLINE_LINUX='%q'\n" "${VAR_GRUB_CMDLINE_LINUX}"
printf "\n" printf "\n"
printf 'GRUB_CMDLINE_LINUX_DEFAULT="%s"\n' "${var_linux_default}" printf "GRUB_CMDLINE_LINUX_DEFAULT='%q'\n" "${VAR_GRUB_CMDLINE_LINUX_DEFAULT}"
printf "\n" printf "\n"
printf "# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh\n" printf "# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh\n"
} >> "${var_file}" } >> "${var_file}"

10
func/cdi_4200_boot/4250_update_grub_bootparameter.sh
View File

@@ -60,13 +60,17 @@ update_grub_bootparameter() {
if [[ "${VAR_NUKE}" == "true" ]]; then if [[ "${VAR_NUKE}" == "true" ]]; then
### 1) Escape every '$' so GRUB won't expand it. ### 1) Escape every '$' so GRUB won't expand it.
var_nuke_esc="${VAR_NUKE_HASH//$/\\$}" #var_nuke_esc="${VAR_NUKE_HASH//$/\\$}"
### 2) Wrap the value in single quotes, so the dollar signs survive GRUB parsing. ### 2) Wrap the value in single quotes, so the dollar signs survive GRUB parsing.
var_nuke_string="nuke='${var_nuke_esc}'" #var_nuke_string="nuke='${var_nuke_esc}'"
### 3) Append to accumulating cmdline variable. Space-prefix ensures clean concatenation. ### 3) Append to accumulating cmdline variable. Space-prefix ensures clean concatenation.
VV_GRUB_CMDLINE_LINUX+=" ${var_nuke_string}"
var_nuke_string="nuke=${VAR_NUKE_HASH}"
# shellcheck disable=SC2034
VV_GRUB_CMDLINE_LINUX="${VV_GRUB_CMDLINE_LINUX} ${var_nuke_string}"
fi fi
grub_finalize_string grub_finalize_string