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

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
2025-07-30 09:14:34 +02:00
parent 835f03110b
commit 62093b15d7
3 changed files with 18 additions and 13 deletions

View File

@@ -233,7 +233,7 @@ recipe:
enable: true enable: true
# btrfs: errors=continue # btrfs: errors=continue
# ext4 : errors=remount-ro # ext4 : errors=remount-ro
options: "defaults,errors=continue,noatime,discard=async,autodefrag" options: "defaults,noatime,discard=async,autodefrag"
optsnap: "nodev,nosuid,noexec" optsnap: "nodev,nosuid,noexec"
path: "/" path: "/"
primary: primary primary: primary

View File

@@ -101,34 +101,34 @@ source_guard "./var/early.var.sh"
source_guard "./lib/0004_color_echo.sh" source_guard "./lib/0004_color_echo.sh"
### ALL CHECKS DONE. READY TO START THE SCRIPT. ### ALL CHECKS DONE. READY TO START THE SCRIPT.
color_echo "${CYA}" "ALL CHECKS DONE. READY TO START THE SCRIPT ..." color_echo "${GRE}" "ALL CHECKS DONE. READY TO START THE SCRIPT ..."
declare -grx VAR_SETUP="true" declare -grx VAR_SETUP="true"
umask 0022 umask 0022
### SOURCING FUNCTIONS, LIBRARIES, VARIABLES. ### SOURCING FUNCTIONS, LIBRARIES, VARIABLES.
if [[ "${VAR_SETUP}" == "true" ]]; then if [[ "${VAR_SETUP}" == "true" ]]; then
### SOURCING VARIABLES ### SOURCING VARIABLES
color_echo "${CYA}" "SOURCING VARIABLES ..." color_echo "${GRE}" "SOURCING VARIABLES ..."
. ./meta_loader_var.sh . ./meta_loader_var.sh
### SOURCING FUNCTIONS ### SOURCING FUNCTIONS
color_echo "${CYA}" "SOURCING FUNCTIONS ..." color_echo "${GRE}" "SOURCING FUNCTIONS ..."
. ./meta_loader_func.sh . ./meta_loader_func.sh
### SOURCING LIBRARIES ### SOURCING LIBRARIES
color_echo "${CYA}" "SOURCING LIBRARIES ..." color_echo "${GRE}" "SOURCING LIBRARIES ..."
. ./meta_loader_lib.sh . ./meta_loader_lib.sh
fi fi
### PREPARING DIRECTORIES AND FILES. ### PREPARING DIRECTORIES AND FILES.
color_echo "${CYA}" "PREPARING DIRECTORIES AND FILES ..." color_echo "${GRE}" "PREPARING DIRECTORIES AND FILES ..."
gen_dir_files gen_dir_files
### CHECKING REQUIRED PACKAGES. ### CHECKING REQUIRED PACKAGES.
color_echo "${CYA}" "CHECKING REQUIRED PACKAGES ..." color_echo "${GRE}" "CHECKING REQUIRED PACKAGES ..."
#check_pkgs #check_pkgs
check_git check_git
### ADVISORY LOCK. ### ADVISORY LOCK.
color_echo "${CYA}" "ADVISORY LOCK ..." color_echo "${GRE}" "ADVISORY LOCK ..."
exec 127>/var/lock/ciss_debian_installer.lock || { exec 127>/var/lock/ciss_debian_installer.lock || {
printf "%b❌ Cannot open lockfile for writing! Bye... %b%b" "${RED}" "${RES}" "${NL}" >&2 printf "%b❌ Cannot open lockfile for writing! Bye... %b%b" "${RED}" "${RES}" "${NL}" >&2
exit "${ERR_FLOCK_PROTECTED}" exit "${ERR_FLOCK_PROTECTED}"
@@ -140,15 +140,15 @@ if ! flock -x -n 127; then
fi fi
### SCAN FOR DEBUG MODE. ### SCAN FOR DEBUG MODE.
color_echo "${CYA}" "SCAN FOR DEBUG MODE ..." color_echo "${GRE}" "SCAN FOR DEBUG MODE ..."
pre_scan_debug "$@" pre_scan_debug "$@"
### CHECK FOR AUTO INSTALL MODE. ### CHECK FOR AUTO INSTALL MODE.
color_echo "${CYA}" "CHECK FOR AUTO INSTALL MODE ..." color_echo "${GRE}" "CHECK FOR AUTO INSTALL MODE ..."
for arg in "$@"; do case "${arg,,}" in -a|--autoinstall) declare -gx VAR_AUTO_INSTALL="true";; esac; done; unset arg for arg in "$@"; do case "${arg,,}" in -a|--autoinstall) declare -gx VAR_AUTO_INSTALL="true";; esac; done; unset arg
### ACTIVATING TRAPS. ### ACTIVATING TRAPS.
color_echo "${CYA}" "ACTIVATING TRAPS ..." color_echo "${GRE}" "ACTIVATING TRAPS ..."
trap 'trap_exit "$?" "${BASH_SOURCE[0]}" "${LINENO}" "${FUNCNAME[0]:-main}" "${BASH_COMMAND}"' EXIT trap 'trap_exit "$?" "${BASH_SOURCE[0]}" "${LINENO}" "${FUNCNAME[0]:-main}" "${BASH_COMMAND}"' EXIT
trap 'trap_err "$?" "${BASH_SOURCE[0]}" "${LINENO}" "${FUNCNAME[0]:-main}" "${BASH_COMMAND}"' ERR trap 'trap_err "$?" "${BASH_SOURCE[0]}" "${LINENO}" "${FUNCNAME[0]:-main}" "${BASH_COMMAND}"' ERR
trap 'trap_int' INT TERM trap 'trap_int' INT TERM
@@ -160,7 +160,7 @@ trap 'trap_int' INT TERM
#if ! "${VAR_AUTO_INSTALL}"; then check_kernel; fi #if ! "${VAR_AUTO_INSTALL}"; then check_kernel; fi
### Dialog Output for Initialization START. ### Dialog Output for Initialization START.
color_echo "${CYA}" "Dialog Output for Initialization START ..." color_echo "${GRE}" "Dialog Output for Initialization START ..."
if ! "${VAR_AUTO_INSTALL}"; then . ./lib/0200_dialog_helper.sh && dialog_box; fi if ! "${VAR_AUTO_INSTALL}"; then . ./lib/0200_dialog_helper.sh && dialog_box; fi
### ARGUMENT CHECKS. ### ARGUMENT CHECKS.

View File

@@ -33,7 +33,12 @@ benchmarking_encryption() {
# shellcheck disable=SC2155 # shellcheck disable=SC2155
declare -girx VAR_ITER_TIME=$(yq_val ".recipe.${VAR_RECIPE_STRING}.control.kdf.time" "${VAR_SETUP_PART}") declare -girx VAR_ITER_TIME=$(yq_val ".recipe.${VAR_RECIPE_STRING}.control.kdf.time" "${VAR_SETUP_PART}")
echo "BENCHMARK CRYPTSETUP ARGON2ID KDF PARAMETER" echo "BENCHMARK CRYPTSETUP ARGON2ID KDF PARAMETER ..."
sync
echo "BENCHMARK CRYPTSETUP ARGON2ID KDF PARAMETER - DROPPING PAGES ..."
echo 3 > /proc/sys/vm/drop_caches
# shellcheck disable=SC2312 # shellcheck disable=SC2312
var_result=$(cryptsetup benchmark --pbkdf argon2id --iter-time "${VAR_ITER_TIME:-3000}" --pbkdf-parallel "${VAR_KDF_THREADS:-1}" 2>/dev/null \ var_result=$(cryptsetup benchmark --pbkdf argon2id --iter-time "${VAR_ITER_TIME:-3000}" --pbkdf-parallel "${VAR_KDF_THREADS:-1}" 2>/dev/null \
| grep -E '^argon2id[[:space:]]+[0-9]+[[:space:]]+iterations') | grep -E '^argon2id[[:space:]]+[0-9]+[[:space:]]+iterations')