V8.00.000.2025.06.17

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

.preseed/partitioning.yaml

@@ -41,7 +41,7 @@ recipe:
       table: "gpt"             # MUST be "gpt" for "UEFI" || "msdos":
       syntax: true             # This is set to "false" by default, otherwise if the recipe is tested by the authors to "true".
       ### Version of the specific recipe.
-      version: "1.1.5"
+      version: "1.1.6"
     dev:
       sda:
         1:
@@ -65,7 +65,7 @@ recipe:
               checksum: ""
               compress: ""
               level: ""
-              dedup: false
+              mdup: ""
               subvolume: ""
               snapshot: ""
             format: true
@@ -99,7 +99,7 @@ recipe:
               checksum: "sha256"
               compress: "zstd"
               level: "0"
-              dedup: false
+              mdup: true
               subvolume: "@boot"
               snapshot: ""
             format: true
@@ -133,7 +133,7 @@ recipe:
               checksum: ""
               compress: ""
               level: ""
-              dedup: false
+              mdup: ""
               subvolume: ""
               snapshot: ""
             format: true
@@ -167,7 +167,7 @@ recipe:
               checksum: ""
               compress: ""
               level: ""
-              dedup: false
+              mdup: ""
               subvolume: ""
               snapshot: ""
             format: true
@@ -201,7 +201,7 @@ recipe:
               checksum: ""
               compress: ""
               level: ""
-              dedup: false
+              mdup: ""
               subvolume: ""
               snapshot: ""
             format: true
@@ -235,7 +235,7 @@ recipe:
               checksum: "sha256"
               compress: "zstd"
               level: "7"
-              dedup: false
+              mdup: true
               subvolume: "@root"
               snapshot: "@root_snap"
             format: true
@@ -269,7 +269,7 @@ recipe:
               checksum: "sha256"
               compress: "zstd"
               level: "7"
-              dedup: false
+              mdup: true
               subvolume: "@home"
               snapshot: "@home_snap"
             format: true
@@ -303,7 +303,7 @@ recipe:
               checksum: "sha256"
               compress: "zstd"
               level: "7"
-              dedup: false
+              mdup: true
               subvolume: "@usr"
               snapshot: ""
             format: true
@@ -337,7 +337,7 @@ recipe:
               checksum: "sha256"
               compress: "zstd"
               level: "7"
-              dedup: false
+              mdup: true
               subvolume: "@var"
               snapshot: "@var_snap"
             format: true
@@ -371,7 +371,7 @@ recipe:
               checksum: "sha256"
               compress: "zstd"
               level: "7"
-              dedup: false
+              mdup: true
               subvolume: "@var_log"
               snapshot: ""
             format: true
@@ -405,7 +405,7 @@ recipe:
               checksum: "sha256"
               compress: "zstd"
               level: "7"
-              dedup: false
+              mdup: true
               subvolume: "@var_log_audit"
               snapshot: ""
             format: true
@@ -439,7 +439,7 @@ recipe:
               checksum: "sha256"
               compress: "zstd"
               level: "7"
-              dedup: false
+              mdup: true
               subvolume: "@var_tmp"
               snapshot: ""
             format: true
@@ -473,7 +473,7 @@ recipe:
               checksum: "sha256"
               compress: "zstd"
               level: "7"
-              dedup: false
+              mdup: true
               subvolume: "@opt"
               snapshot: ""
             format: true

func/partitioning/3200_partitioning.sh

@@ -49,9 +49,9 @@ partitioning() {
   for var_dev in "${ary_devs[@]}"; do
 
     ### All current data for the respective device will be deleted.
-    if ! blkdiscard "/dev/${var_dev}"; then
+    if ! blkdiscard -f "/dev/${var_dev}"; then
 
-      do_log "warn" "file_only" "3200() Partition table: '/dev/${var_dev}' deletion failed with: 'blkdiscard' trying 'sgdisk' fallback."
+      do_log "warn" "file_only" "3200() Partition table: '/dev/${var_dev}' deletion failed with: 'blkdiscard -f' trying 'sgdisk' fallback."
 
       if command -v sgdisk >/dev/null && sgdisk --zap-all "/dev/${var_dev}"; then
 

func/partitioning/3240_partition_formatting.sh

@@ -28,7 +28,7 @@ partition_formatting() {
   ### Declare Arrays and Variables.
   declare -Agx HMP_PATH_FSUUID
   declare var_dev var_part \
-    var_encryption_enable var_encryption_label var_fs_btrfs_checksum var_fs_btrfs_compress var_fs_btrfs_dedup \
+    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 -a ary_devs ary_parts ary_opts ary_fmt_opts
 
@@ -47,7 +47,7 @@ partition_formatting() {
       var_encryption_label=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.encryption.label"           "${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_dedup=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.btrfs.dedup"       "${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_label=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.label"                   "${VAR_SETUP_PART}")
       var_fs_options=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.options"               "${VAR_SETUP_PART}")
@@ -75,9 +75,9 @@ partition_formatting() {
 
         btrfs)
           ary_opts=( -L "${var_fs_label}" -f --csum "${var_fs_btrfs_checksum}" )
-          [[ "${var_fs_btrfs_dedup,,}" == "true" ]] && ary_opts+=( -m dup )
+          [[ "${var_fs_btrfs_mdup,,}" == "true" ]] && ary_opts+=( -m dup )
           mkfs.btrfs "${ary_opts[@]}" "${var_node}"
-          do_log "info" "file_only" "3240() Partition: '${var_node}' formatted: btrfs."
+          do_log "info" "file_only" "3240() Partition: '${var_node}' formatted: 'btrfs' options: '${ary_opts[*]}'."
           echo "Partition: '${var_node}':" >> "${DIR_LOG}/btrfs.log"
           btrfs filesystem show "${var_node}" >> "${DIR_LOG}/btrfs.log"
           var_fs_uuid=$(blkid -s UUID -o value "${var_node}")
@@ -87,7 +87,7 @@ partition_formatting() {
         ext4)
           read -r -a ary_fmt_opts <<< "${var_fs_options}"
           mkfs.ext4 -L "${var_fs_label}" "${ary_fmt_opts[@]}" "${var_node}"
-          do_log "info" "file_only" "3240() Partition: '${var_node}' formatted: ext4."
+          do_log "info" "file_only" "3240() Partition: '${var_node}' formatted: 'ext4' options: '${ary_fmt_opts[*]}'."
           echo "Partition: '${var_node}':" >> "${DIR_LOG}/ext4.log"
           tune2fs -l "${var_node}" >> "${DIR_LOG}/ext4.log"
           var_fs_uuid=$(blkid -s UUID -o value "${var_node}")
@@ -96,7 +96,7 @@ partition_formatting() {
 
         fat32)
           mkfs.fat -F 32 -n "${var_fs_label}" "${var_node}"
-          do_log "info" "file_only" "3240() Partition: '${var_node}' formatted: FAT32."
+          do_log "info" "file_only" "3240() Partition: '${var_node}' formatted: 'FAT32'."
           var_fs_uuid=$(blkid -s UUID -o value "${var_node}")
           HMP_PATH_FSUUID["UUID_${var_mount_path}"]="${var_fs_uuid}"
           ;;