V8.00.000.2025.06.17

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>

func/partitioning/3200_partitioning.sh

@@ -241,6 +241,9 @@ partitioning() {
         do_log "debug" "file_only" "3200() Stored in HashMap [HMP_PATH_PARTUUID]     : '${var_mount_path}' -> '${HMP_PATH_PARTUUID["${var_mount_path}"]}'."
       fi
 
+      ### Gathering information for forthcoming modules 32n0().
+      HMP_PATH_DEV_PART["${var_mount_path}"]="${var_dev}.${var_part}"
+
       ### Gathering information for encryption module 3220().
       if [[ "${var_encryption}" == "true" ]]; then
         ARY_CRYPT_MOUNT_PATHS+=("${var_mount_path}")

func/partitioning/3220_partition_encryption.sh

@@ -59,7 +59,7 @@ partition_encryption() {
   for var_encryption_path in "${ARY_CRYPT_MOUNT_PATHS[@]}"; do
 
     ### Generates physical device location.
-    var_dev_part="${HMP_PATH_DEV_PART[${var_encryption_path}]}"
+    var_dev_part="${HMP_PATH_DEV_PART["${var_encryption_path}"]}"
 
     ### Extract parameters from YAML.
     var_encryption_ephemeral=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev_part}.encryption.ephemeral" "${VAR_SETUP_PART}")
@@ -108,6 +108,7 @@ partition_encryption() {
 
     if [[ "${var_encryption_ephemeral,,}" == "true" ]]; then
 
+      ### Preparation of Ephemeral 'SWAP' and '/tmp' as per https://wiki.archlinux.org/title/Dm-crypt/Swap_encryption#UUID_and_LABEL
       case "${var_encryption_path,,}" in
 
         swap|/tmp)

func/partitioning/3240_partition_formatting.sh

@@ -13,10 +13,13 @@
 guard_sourcing
 
 #######################################
-# Function to format the respective partition on each device according to the recipe string chosen.
+# Function to format the respective partition on each entry of 'ARY_FORMT_MOUNT_PATHS'.
 # Globals:
+#   ARY_FORMT_MOUNT_PATHS
 #   DIR_LOG
+#   HMP_PATH_DEV_PART
 #   HMP_PATH_FSUUID
+#   NL
 #   VAR_RECIPE_STRING
 #   VAR_SETUP_PART
 # Arguments:
@@ -28,110 +31,103 @@ partition_formatting() {
   ### Declare Arrays, HashMaps, and Variables.
   declare -Ag HMP_PATH_FSUUID        # Used in: 3290() - [Mount Path:Filesystem UUID].
                                      # Used in: 4060() - [Mount Path:Filesystem UUID].
-  declare var_dev="" var_part="" \
-    var_encryption_enable="" var_encryption_label="" var_fs_btrfs_checksum="" var_fs_btrfs_compress="" var_fs_btrfs_mdup="" \
-    var_fs_format="" var_fs_label="" var_fs_options="" var_fs_version="" var_mount_path="" var_node="" var_fs_uuid=""
+  declare var_dev="" var_dev_part="" \
+    var_encryption_enable="" var_encryption_label="" var_format_path="" var_fs_btrfs_checksum="" var_fs_btrfs_compress="" \
+    var_fs_btrfs_mdup="" var_fs_label="" var_fs_options="" var_fs_version="" var_node="" var_fs_uuid=""
 
-  declare -a ary_devs=() ary_parts=() ary_opts=() ary_fmt_opts=()
+  declare -a ary_opts=() ary_fmt_opts=()
 
   for var_format_path in "${ARY_FORMT_MOUNT_PATHS[@]}"; do
 
     ### Generates physical device location.
-    var_dev_part="${HMP_PATH_DEV_PART[${var_format_path}]}"
+    var_dev_part="${HMP_PATH_DEV_PART["${var_format_path}"]}"
 
     ### Extract parameters from YAML.
+    var_encryption_enable=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev_part}.encryption.enable"         "${VAR_SETUP_PART}")
+    var_fs_btrfs_checksum=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev_part}.filesystem.btrfs.checksum" "${VAR_SETUP_PART}")
+    var_fs_btrfs_compress=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev_part}.filesystem.btrfs.compress" "${VAR_SETUP_PART}")
+    var_fs_btrfs_mdup=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev_part}.filesystem.btrfs.mdup"         "${VAR_SETUP_PART}")
+    var_fs_options=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev_part}.filesystem.options"               "${VAR_SETUP_PART}")
+    var_fs_version=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev_part}.filesystem.version"               "${VAR_SETUP_PART}")
 
-      ### Extract parameters from YAML.
-      var_encryption_enable=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.encryption.enable"         "${VAR_SETUP_PART}")
-      var_fs_btrfs_checksum=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.btrfs.checksum" "${VAR_SETUP_PART}")
-      var_fs_btrfs_compress=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.btrfs.compress" "${VAR_SETUP_PART}")
-      var_fs_btrfs_mdup=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.btrfs.mdup"         "${VAR_SETUP_PART}")
-      var_fs_format=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.format"                 "${VAR_SETUP_PART}")
-      var_fs_options=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.options"               "${VAR_SETUP_PART}")
-      var_fs_version=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.version"               "${VAR_SETUP_PART}")
-      var_mount_path=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.mount.path"                       "${VAR_SETUP_PART}")
+    case "${var_format_path,,}" in
+      swap|/tmp)
+        do_log "info" "file_only" "3240() Partition: '/dev/${var_dev_part}' ephemeral encryption already prepared in 3220(): '${var_format_path}'."
+        ### Nothing more to do here.
+        continue
+        ;;
+    esac
 
-      [[ "${var_fs_format,,}" != "true" ]] && continue
+    if [[ "${var_encryption_enable,,}" == "true" ]]; then
+      var_encryption_label=$(get_label "${var_format_path}" "${var_fs_version}" "luks")
+      var_node="/dev/mapper/${var_encryption_label}"
+    else
+      var_node="/dev/${var_dev_part}"
+    fi
 
-      ### Preparation of Ephemeral 'SWAP' and '/tmp' as per https://wiki.archlinux.org/title/Dm-crypt/Swap_encryption#UUID_and_LABEL
-      case "${var_mount_path,,}" in
-        swap|/tmp)
-          do_log "info" "file_only" "3240() Partition: '/dev/${var_dev}${var_part}' ephemeral encryption already prepared in 3220(): '${var_mount_path}'."
-          continue
-          ;;
-      esac
+    var_fs_label=$(get_label "${var_format_path}" "${var_fs_version}" "file")
 
-      if [[ "${var_encryption_enable,,}" == "true" ]]; then
-        var_encryption_label=$(get_label "${var_mount_path}" "${var_fs_version}" "luks")
-        var_node="/dev/mapper/${var_encryption_label}"
-      else
-        var_node="/dev/${var_dev}${var_part}"
-      fi
+    case "${var_fs_version,,}" in
 
-      var_fs_label=$(get_label "${var_mount_path}" "${var_fs_version}" "file")
+      btrfs)
+        ary_opts=( -L "${var_fs_label}" -f --csum "${var_fs_btrfs_checksum}" )
+        [[ "${var_fs_btrfs_mdup,,}" == "true" ]] && ary_opts+=( -m dup )
 
-      case "${var_fs_version,,}" in
+        mkfs.btrfs "${ary_opts[@]}" "${var_node}"
 
-        btrfs)
-          ary_opts=( -L "${var_fs_label}" -f --csum "${var_fs_btrfs_checksum}" )
-          [[ "${var_fs_btrfs_mdup,,}" == "true" ]] && ary_opts+=( -m dup )
+        do_log "debug" "file_only" "3240() [mkfs.btrfs ${ary_opts[*]} ${var_node}]."
+        do_log "info" "file_only" "3240() Partition: '${var_node}' formatted: 'btrfs' options: '${ary_opts[*]}'."
 
-          mkfs.btrfs "${ary_opts[@]}" "${var_node}"
+        echo "Partition: '${var_node}':" >> "${DIR_LOG}/btrfs.log"
+        btrfs filesystem show "${var_node}" >> "${DIR_LOG}/btrfs.log"
 
-          do_log "debug" "file_only" "3240() [mkfs.btrfs ${ary_opts[*]} ${var_node}]."
-          do_log "info" "file_only" "3240() Partition: '${var_node}' formatted: 'btrfs' options: '${ary_opts[*]}'."
+        var_fs_uuid=$(blkid -s UUID -o value "${var_node}")
+        ### Gathering information for '/etc/fstab'-generation in 4040().
+        HMP_PATH_FSUUID["${var_format_path}"]="${var_fs_uuid}"
+        ;;
 
-          echo "Partition: '${var_node}':" >> "${DIR_LOG}/btrfs.log"
-          btrfs filesystem show "${var_node}" >> "${DIR_LOG}/btrfs.log"
+      ext4)
+        read -r -a ary_fmt_opts <<< "${var_fs_options}"
 
-          var_fs_uuid=$(blkid -s UUID -o value "${var_node}")
-          ### Gathering information for '/etc/fstab'-generation in 4040().
-          HMP_PATH_FSUUID["${var_mount_path}"]="${var_fs_uuid}"
-          ;;
+        mkfs.ext4 -L "${var_fs_label}" "${ary_fmt_opts[@]}" "${var_node}"
 
-        ext4)
-          read -r -a ary_fmt_opts <<< "${var_fs_options}"
+        do_log "debug" "file_only" "3240() [mkfs.ext4 -L ${var_fs_label} ${ary_fmt_opts[*]} ${var_node}]."
+        do_log "info" "file_only" "3240() Partition: '${var_node}' formatted: 'ext4' options: '${ary_fmt_opts[*]}'."
 
-          mkfs.ext4 -L "${var_fs_label}" "${ary_fmt_opts[@]}" "${var_node}"
+        echo "Partition: '${var_node}':" >> "${DIR_LOG}/ext4.log"
+        tune2fs -l "${var_node}" >> "${DIR_LOG}/ext4.log"
 
-          do_log "debug" "file_only" "3240() [mkfs.ext4 -L ${var_fs_label} ${ary_fmt_opts[*]} ${var_node}]."
-          do_log "info" "file_only" "3240() Partition: '${var_node}' formatted: 'ext4' options: '${ary_fmt_opts[*]}'."
+        var_fs_uuid=$(blkid -s UUID -o value "${var_node}")
+        ### Gathering information for '/etc/fstab'-generation in 4040().
+        HMP_PATH_FSUUID["${var_format_path}"]="${var_fs_uuid}"
+        ;;
 
-          echo "Partition: '${var_node}':" >> "${DIR_LOG}/ext4.log"
-          tune2fs -l "${var_node}" >> "${DIR_LOG}/ext4.log"
+      fat32)
+        mkfs.fat -F 32 -n "${var_fs_label}" "${var_node}"
 
-          var_fs_uuid=$(blkid -s UUID -o value "${var_node}")
-          ### Gathering information for '/etc/fstab'-generation in 4040().
-          HMP_PATH_FSUUID["${var_mount_path}"]="${var_fs_uuid}"
-          ;;
+        do_log "debug" "file_only" "3240() [mkfs.fat -F 32 -n ${var_fs_label} ${var_node}]."
+        do_log "info" "file_only" "3240() Partition: '${var_node}' formatted: 'FAT32'."
 
-        fat32)
-          mkfs.fat -F 32 -n "${var_fs_label}" "${var_node}"
+        var_fs_uuid=$(blkid -s UUID -o value "${var_node}")
+        ### Gathering information for '/etc/fstab'-generation in 4040().
+        HMP_PATH_FSUUID["${var_format_path}"]="${var_fs_uuid}"
+        ;;
 
-          do_log "debug" "file_only" "3240() [mkfs.fat -F 32 -n ${var_fs_label} ${var_node}]."
-          do_log "info" "file_only" "3240() Partition: '${var_node}' formatted: 'FAT32'."
+      *)
+        do_log "error" "file_only" "3240() Unsupported filesystem format: '${var_fs_version}'."
+        continue
+        ;;
 
-          var_fs_uuid=$(blkid -s UUID -o value "${var_node}")
-          ### Gathering information for '/etc/fstab'-generation in 4040().
-          HMP_PATH_FSUUID["${var_mount_path}"]="${var_fs_uuid}"
-          ;;
+    esac
 
-        *)
-          do_log "error" "file_only" "3240() Unsupported filesystem format: '${var_fs_version}'."
-          ;;
-
-      esac
-
-    done
+    var_dev="${HMP_PATH_DEV_PART["${var_format_path}"]}"
+    var_dev="${var_dev%.*}"
 
     lsblk -o NAME,MAJ:MIN,FSTYPE,FSVER,SIZE,UUID,MOUNTPOINT,PATH "/dev/${var_dev}" >| "${DIR_LOG}/${var_dev}_overview.log"
     printf "%b" "${NL}" >> "${DIR_LOG}/${var_dev}_overview.log"
     lsblk "/dev/${var_dev}" >> "${DIR_LOG}/${var_dev}_overview.log"
 
-
-
-
-
+  done
 
   return 0
 }