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

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
2025-06-25 19:22:15 +02:00
parent 96fb3c722c
commit 1fc161d4eb
3 changed files with 65 additions and 59 deletions

View File

@@ -52,8 +52,8 @@ do_print_color() {
do_print_fold() {
declare var_color="$1"; shift
declare var_msg_string="$*"
declare var_formatted_String="${var_color}${var_msg_string}${C_RES}"
printf "%b\n" "${var_formatted_String}" | fold -s -w 76 | sed '1! s/^/ /'
declare var_formatted_string="${var_color}${var_msg_string}${C_RES}"
printf "%b\n" "${var_formatted_string}" | fold -s -w 76 | sed '1! s/^/ /'
}
#######################################

View File

@@ -17,15 +17,14 @@
#######################################
log_level_value() {
case "${1,,}" in
debug) echo 0 ;;
info) echo 1 ;;
notice) echo 2 ;;
warn) echo 3 ;;
error) echo 4 ;;
critical) echo 5 ;;
fatal) echo 6 ;;
emergency) echo 7 ;;
*) echo 0 ;;
debug) printf '%d' 7 ;;
info) printf '%d' 6 ;;
notice) printf '%d' 5 ;;
warn) printf '%d' 4 ;;
error) printf '%d' 3 ;;
critical) printf '%d' 2 ;;
fatal) printf '%d' 1 ;;
emergency) printf '%d' 0 ;;
esac
}
@@ -38,14 +37,11 @@ log_level_value() {
#######################################
do_should_log() {
# shellcheck disable=SC2155
declare var_desired_log_value=$(log_level_value "$1")
declare -i var_desired_log_value=$(log_level_value "$1") # Desired log level
# shellcheck disable=SC2155
declare var_default_log_value=$(log_level_value "${DEFAULT_LOG_LEVEL}")
if [[ ${var_desired_log_value} -ge ${var_default_log_value} ]]; then
return 0
else
return 1
fi
declare -i var_default_log_value=$(log_level_value "${DEFAULT_LOG_LEVEL}") # Current threshold
### Return true if a message should be logged.
[[ $var_desired_log_value -le $var_default_log_value ]]
}
#######################################
@@ -55,6 +51,7 @@ do_should_log() {
# C_GRN
# C_MAG
# C_RED
# C_WHI
# C_YEL
# Arguments:
# $1: "${LOG_LEVEL}" one of: "debug" | "info" | "notice" | "warn" | "error" | "critical" | "fatal" | "emergency"
@@ -92,12 +89,12 @@ do_log() {
declare var_log_entry=("${var_ts} [${var_log_level}]: ${ary_message[*]}")
if do_should_log "${var_log_level}"; then
if [[ "${var_log_only,,}" == true ]]; then
if [[ "${var_log_only,,}" == "true" ]]; then
case "${var_log_level,,}" in
debug | info | notice) do_print_log "${var_log_entry[*]}" >> "${LOG_INS}" ;;
warn | error | critical | fatal | emergency ) do_print_log "${var_log_entry[*]}" >> "${LOG_ERR}" ;;
esac
elif [[ ${var_log_only,,} == false ]]; then
elif [[ "${var_log_only,,}" == "false" ]]; then
case "${var_log_level,,}" in
debug | info | notice)
if [[ ${#var_msg_string} -le 76 ]]; then

View File

@@ -14,6 +14,11 @@
###########################################################################################
# Function to format the respective partition on each device according to the recipe string chosen.
partition_formatting() {
### Declare Arrays and Variables.
declare var_dev var_part \
var_encryption_enable var_encryption_label var_fs_btrfs_checksum var_fs_btrfs_compress var_fs_btrfs_dedup \
var_fs_format var_fs_label var_fs_options var_fs_version var_mount_path
### Iterate over all devices in the recipe.
for var_dev in $(yq e ".recipe.${VAR_RECIPE_STRING}.dev | keys | .[]" "${VAR_SETUP_PART}"); do
@@ -32,7 +37,6 @@ partition_formatting() {
var_fs_version=$(yq e ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.version" "${VAR_SETUP_PART}")
var_mount_path=$(yq e ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.mount.path" "${VAR_SETUP_PART}")
### Formatting partition
if [[ "${var_encryption_enable,,}" == "true" && "${var_mount_path}" != "SWAP" && "${var_mount_path}" != "/tmp" ]]; then
@@ -50,79 +54,84 @@ partition_formatting() {
elif [[ "${var_fs_btrfs_dedup,,}" == "false" ]]; then
mkfs.btrfs -L "${FILESYSTEM_LABEL}" /dev/mapper/"${ENCRYPTION_LABEL}" -f --csum "${BTRFS_CHECKSUM}" -O compress="${BTRFS_COMPRESS}"
do_log "info" "false" "Partition: '/dev/mapper/${ENCRYPTION_LABEL}' formatted: '${FILESYSTEM_VERSION}'."
mkfs.btrfs -L "${var_fs_label}" "/dev/mapper/${var_encryption_label}" -f --csum "${var_fs_btrfs_checksum}" -O compress="${var_fs_btrfs_compress}"
do_log "info" "false" "Partition: '/dev/mapper/${var_encryption_label}' formatted: '${var_fs_version}'."
# shellcheck disable=SC2129
echo "Partition: '/dev/mapper/${ENCRYPTION_LABEL}':" >> "${DIR_LOG}"btrfs.log
btrfs filesystem show /dev/mapper/"${ENCRYPTION_LABEL}" >> "${DIR_LOG}"btrfs.log
echo "" >> "${DIR_LOG}"btrfs.log
echo "Partition: '/dev/mapper/${var_encryption_label}':" >> "${DIR_LOG}/btrfs.log"
btrfs filesystem show "/dev/mapper/${var_encryption_label}" >> "${DIR_LOG}/btrfs.log"
echo "" >> "${DIR_LOG}/btrfs.log"
else
do_log "error" "false" "Partition: '/dev/mapper/${ENCRYPTION_LABEL}': Unsupported deduplication method: '${BTRFS_DEDUP}'."
do_log "error" "false" "Partition: '/dev/mapper/${var_encryption_label}': Unsupported deduplication method: '${var_fs_btrfs_dedup}'."
fi
elif [[ ${FILESYSTEM_FORMAT,,} == "true" && ${FILESYSTEM_FORMAT} == "ext4" ]]; then
elif [[ "${var_fs_format,,}" == "true" && "${var_fs_version}" == "ext4" ]]; then
mkfs.ext4 -L "${var_fs_label}" "/dev/mapper/${var_encryption_label}" "${var_fs_options:+ $var_fs_options}"
do_log "info" "false" "Partition: '/dev/mapper/${var_encryption_label}' formatted: '${var_fs_version}'."
mkfs.ext4 -L "${FILESYSTEM_LABEL}" /dev/mapper/"${ENCRYPTION_LABEL}" "${FILESYSTEM_OPTIONS:+ $FILESYSTEM_OPTIONS}"
do_log "info" "false" "Partition: '/dev/mapper/${ENCRYPTION_LABEL}' formatted: '${FILESYSTEM_VERSION}'."
# shellcheck disable=SC2129
echo "Partition: '/dev/mapper/${ENCRYPTION_LABEL}':" >> "${DIR_LOG}"ext4.log
tune2fs -l /dev/mapper/"${ENCRYPTION_LABEL}" >> "${DIR_LOG}"ext4.log
echo "" >> "${DIR_LOG}"ext4.log
echo "Partition: '/dev/mapper/${var_encryption_label}':" >> "${DIR_LOG}/ext4.log"
tune2fs -l "/dev/mapper/${var_encryption_label}" >> "${DIR_LOG}/ext4.log"
echo "" >> "${DIR_LOG}/ext4.log"
else
do_log "error" "false" "Partition: '/dev/mapper/${ENCRYPTION_LABEL}': Unsupported filesystem format: '${FILESYSTEM_FORMAT}'."
do_log "error" "false" "Partition: '/dev/mapper/${var_encryption_label}': Unsupported filesystem format: '${var_fs_version}'."
fi
elif [[ ${ENCRYPTION_ENABLE,,} == "false" && ${MOUNT_PATH} != "SWAP" && ${MOUNT_PATH} != "/tmp" ]]; then
elif [[ "${var_encryption_enable,,}" == "false" && "${var_mount_path}" != "SWAP" && "${var_mount_path}" != "/tmp" ]]; then
if [[ ${FILESYSTEM_FORMAT,,} == "true" && ${FILESYSTEM_FORMAT} == "btrfs" ]]; then
if [[ "${var_fs_format,,}" == "true" && "${var_fs_version}" == "btrfs" ]]; then
if [[ ${BTRFS_DEDUP,,} == "true" ]]; then
if [[ "${var_fs_btrfs_dedup,,}" == "true" ]]; then
mkfs.btrfs -L "${var_fs_label}" "/dev/${var_dev}${var_part}" -f --csum "${var_fs_btrfs_checksum}" -m dup -O compress="${var_fs_btrfs_compress}"
do_log "info" "false" "Partition: '/dev/${var_dev}${var_part}' formatted: '${var_fs_version}'."
mkfs.btrfs -L "${FILESYSTEM_LABEL}" /dev/"${DEV}""${PARTITION}" -f --csum "${BTRFS_CHECKSUM}" -m dup -O compress="${BTRFS_COMPRESS}"
do_log "info" "false" "Partition: '/dev/${DEV}${PARTITION}' formatted: '${FILESYSTEM_VERSION}'."
# shellcheck disable=SC2129
echo "Partition: '/dev/${DEV}${PARTITION}':" >> "${DIR_LOG}"btrfs.log
btrfs filesystem show /dev/"${DEV}""${PARTITION}" >> "${DIR_LOG}"btrfs.log
echo "" >> "${DIR_LOG}"btrfs.log
echo "Partition: '/dev/${var_dev}${var_part}':" >> "${DIR_LOG}/btrfs.log"
btrfs filesystem show "/dev/${var_dev}${var_part}" >> "${DIR_LOG}/btrfs.log"
echo "" >> "${DIR_LOG}/btrfs.log"
elif [[ ${BTRFS_DEDUP,,} == "false" ]]; then
elif [[ "${var_fs_btrfs_dedup,,}" == "false" ]]; then
mkfs.btrfs -L "${var_fs_label}" "/dev/${var_dev}${var_part}" -f --csum "${var_fs_btrfs_checksum}" -O compress="${var_fs_btrfs_compress}"
do_log "info" "false" "Partition: '/dev/${var_dev}${var_part}' formatted: '${var_fs_version}'."
mkfs.btrfs -L "${FILESYSTEM_LABEL}" /dev/"${DEV}""${PARTITION}" -f --csum "${BTRFS_CHECKSUM}" -O compress="${BTRFS_COMPRESS}"
do_log "info" "false" "Partition: '/dev/${DEV}${PARTITION}' formatted: '${FILESYSTEM_VERSION}'."
# shellcheck disable=SC2129
echo "Partition: '/dev/${DEV}${PARTITION}':" >> "${DIR_LOG}"btrfs.log
btrfs filesystem show /dev/"${DEV}""${PARTITION}" >> "${DIR_LOG}"btrfs.log
echo "" >> "${DIR_LOG}"btrfs.log
echo "Partition: '/dev/${var_dev}${var_part}':" >> "${DIR_LOG}/btrfs.log"
btrfs filesystem show "/dev/${var_dev}${var_part}" >> "${DIR_LOG}/btrfs.log"
echo "" >> "${DIR_LOG}/btrfs.log"
else
do_log "error" "false" "Partition: '/dev/${DEV}${PARTITION}': Unsupported deduplication method: '${BTRFS_DEDUP}'."
do_log "error" "false" "Partition: '/dev/${var_dev}${var_part}': Unsupported deduplication method: '${var_fs_btrfs_dedup}'."
fi
elif [[ ${FILESYSTEM_FORMAT,,} == "true" && ${FILESYSTEM_FORMAT} == "ext4" ]]; then
elif [[ "${var_fs_format,,}" == "true" && "${var_fs_version}" == "ext4" ]]; then
mkfs.ext4 -L "${var_fs_label}" "/dev/${var_dev}${var_part}" "${var_fs_options:+ $var_fs_options}"
do_log "info" "false" "Partition: '/dev/${var_dev}${var_part}' formatted: '${var_fs_version}'."
mkfs.ext4 -L "${FILESYSTEM_LABEL}" /dev/"${DEV}""${PARTITION}" "${FILESYSTEM_OPTIONS:+ $FILESYSTEM_OPTIONS}"
do_log "info" "false" "Partition: '/dev/${DEV}${PARTITION}' formatted: '${FILESYSTEM_VERSION}'."
# shellcheck disable=SC2129
echo "Partition: '/dev/${DEV}${PARTITION}':" >> "${DIR_LOG}"ext4.log
tune2fs -l /dev/"${DEV}""${PARTITION}" >> "${DIR_LOG}"ext4.log
echo "" >> "${DIR_LOG}"ext4.log
echo "Partition: '/dev/${var_dev}${var_part}':" >> "${DIR_LOG}/ext4.log"
tune2fs -l "/dev/${var_dev}${var_part}" >> "${DIR_LOG}/ext4.log"
echo "" >> "${DIR_LOG}/ext4.log"
elif [[ ${FILESYSTEM_FORMAT,,} == "true" && ${FILESYSTEM_FORMAT} == "FAT32" ]]; then
elif [[ "${var_fs_format,,}" == "true" && "${var_fs_version}" == "FAT32" ]]; then
mkfs.fat -F 32 /dev/"${DEV}""${PARTITION}"
do_log "info" "false" "Partition: '/dev/${DEV}${PARTITION}' formatted: '${FILESYSTEM_VERSION}'."
mkfs.fat -F 32 "/dev/${var_dev}${var_part}"
do_log "info" "false" "Partition: '/dev/${var_dev}${var_part}' formatted: '${var_fs_version}'."
else
do_log "error" "false" "Partition: '/dev/${DEV}${PARTITION}': Unsupported filesystem format: '${FILESYSTEM_FORMAT}'."
do_log "error" "false" "Partition: '/dev/${var_dev}${var_part}': Unsupported filesystem format: '${var_fs_version}'."
fi