V8.00.000.2025.06.17

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

func/partitioning/3280_mount_partition.sh

@@ -113,7 +113,7 @@ mount_partition() {
 
   else
 
-    do_log "error" "file_only" "3280() Root-filesystem '${var_mount_path_root}' not found in Hashmap."
+    do_log "error" "file_only" "3280() Root-filesystem '${var_mount_path_root}' not found in Hashmap: 'HMP_MOUNTPATH_DEV'."
     return "${ERR_MOUNTING_ROOT}"
 
   fi
@@ -129,7 +129,7 @@ mount_partition() {
 
     else
 
-      do_log "info" "file_only" "3280() Entry '${var_path}' not found in Hashmap."
+      do_log "info" "file_only" "3280() Entry '${var_path}' not found in Hashmap: 'HMP_MOUNTPATH_DEV'."
 
     fi
 
@@ -138,7 +138,7 @@ mount_partition() {
   declare var_dev var_part \
     var_fs_btrfs_compress var_fs_btrfs_level var_fs_btrfs_subvolume var_fs_btrfs_snapshot \
     var_encryption_enable var_encryption_label \
-    var_fs_label var_fs_options var_fs_version var_mount_path var_mount_options var_mount_optsnap
+    var_fs_label var_fs_options var_fs_version var_mount_path var_mount_options var_snapshot var_mount_optsnap
   declare -a ary_devs ary_parts
 
   ### Iterate over all devices in the recipe.
@@ -154,11 +154,8 @@ mount_partition() {
       ### Extract parameters from YAML.
       var_fs_btrfs_compress=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.btrfs.compress"   "${VAR_SETUP_PART}")
       var_fs_btrfs_level=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.btrfs.level"         "${VAR_SETUP_PART}")
-      var_fs_btrfs_subvolume=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.btrfs.subvolume" "${VAR_SETUP_PART}")
       var_fs_btrfs_snapshot=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.btrfs.snapshot"   "${VAR_SETUP_PART}")
       var_encryption_enable=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.encryption.enable"           "${VAR_SETUP_PART}")
-      var_encryption_label=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.encryption.label"             "${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}")
       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}")
@@ -168,21 +165,34 @@ mount_partition() {
       ### Skip already mounted paths ("/", "/boot", "/boot/efi") and skip ("/recovery")
       skip_path "${var_mount_path}" && continue
 
+      var_encryption_label=$(get_label "${var_mount_path}" "${var_fs_version}" "luks")
+
       if [[ "${var_mount_path}" == "SWAP" ]]; then
 
+        var_fs_label=$(get_label "${var_mount_path}" "${var_fs_version}" "file")
+
         cryptsetup open --type plain --key-file /dev/random \
           --offset 2048 --cipher aes-xts-plain64 --key-size 512 \
           --sector-size 4096 "/dev/disk/by-label/${var_fs_label}" "${var_encryption_label}"
+
         mkswap "/dev/mapper/${var_encryption_label}"
-        swapon "/dev/mapper/${var_encryption_label}"
+        do_log "debug" "file_only" "3280() [mkswap /dev/mapper/${var_encryption_label}]."
         do_log "info" "file_only" "3280() Mounted: '${var_mount_path}' on: '/dev/mapper/${var_encryption_label}'."
+
+        swapon "/dev/mapper/${var_encryption_label}"
+        do_log "debug" "file_only" "3280() [swapon /dev/mapper/${var_encryption_label}]."
+        do_log "info" "file_only" "3280() Mounted: '${var_mount_path}' on: '/dev/mapper/${var_encryption_label}'."
+
         continue
 
       elif [[ "${var_mount_path}" == "/tmp" ]]; then
 
+        var_fs_label=$(get_label "${var_mount_path}" "${var_fs_version}" "file")
+
         cryptsetup open --type plain --key-file /dev/random \
           --offset 2048 --cipher aes-xts-plain64 --key-size 512 \
           --sector-size 4096 "/dev/disk/by-label/${var_fs_label}" "${var_encryption_label}"
+
         mkdir -p "${TARGET}/tmp"
 
         # TODO: Remove Debug
@@ -190,10 +200,10 @@ mount_partition() {
         [[ -b "/dev/mapper/${var_encryption_label}" ]] || {
           do_log "error" "file_only" "Mapper-Device: '/dev/mapper/${var_encryption_label}' non-existing."
         }
+
         echo "lsblk -o NAME,SIZE,TYPE,FSTYPE,LABEL /dev/mapper/${var_encryption_label}"
         lsblk -o NAME,SIZE,TYPE,FSTYPE,LABEL /dev/mapper/"${var_encryption_label}"
-        echo "/dev/mapper/${var_encryption_label}"
-        blkid /dev/mapper/"${var_encryption_label}"
+
         echo "safe_exec mkfs.ext4 -E nodiscard,lazy_itable_init=1,lazy_journal_init=1 /dev/mapper/${var_encryption_label} ${ERR_MOUNTING_DEV}"
         safe_exec mkfs.ext4 -E nodiscard,lazy_itable_init=1,lazy_journal_init=1 "/dev/mapper/${var_encryption_label}" "${ERR_MOUNTING_DEV}" || return "${ERR_MOUNTING_DEV}"
         #mkfs.ext4 -E nodiscard,lazy_itable_init=1,lazy_journal_init=1 "/dev/mapper/${var_encryption_label}"
@@ -203,11 +213,13 @@ mount_partition() {
 
         ### Build the command in an array to keep word boundaries intact
         declare -a ary_cmd2=(mount)
-        [[ -n "${var_mount_options}" ]] && ary_cmd2+=("-o" "${var_mount_options}")
+
+        #[[ -n "${var_mount_options}" ]] && ary_cmd2+=("-o" "${var_mount_options}")
         ary_cmd2+=("/dev/mapper/${var_encryption_label}" "${TARGET}${var_mount_path}")
 
         safe_exec "${ary_cmd2[@]}" "${ERR_MOUNTING_DEV}" || return "${ERR_MOUNTING_DEV}"
         do_log "info" "file_only" "3280() Mounted: '${var_mount_path}' on: '/dev/mapper/${var_encryption_label}'."
+
         continue
 
       fi
@@ -217,16 +229,23 @@ mount_partition() {
 
       if [[ "${var_fs_version,,}" == "btrfs" ]]; then
 
+        var_fs_btrfs_subvolume=$(get_label "${var_mount_path}" "${var_fs_version}" "sub")
+
         ### Mount toplevel (subvolid=0) without extra options.
         declare -a ary_cmd_mount=(mount -o "subvolid=0" "${var_resolved_dev}" "${VAR_SAFE_MNT_BASE}")
         safe_exec "${ary_cmd_mount[@]}" "${ERR_BTRFS_INITPH}" || return "${ERR_BTRFS_INITPH}"
 
-        btrfs subvolume create "${VAR_SAFE_MNT_BASE}"/"${var_fs_btrfs_subvolume}"
+        btrfs subvolume create "${VAR_SAFE_MNT_BASE}/${var_fs_btrfs_subvolume}"
+        do_log "debug" "file_only" "3280() [btrfs subvolume create ${VAR_SAFE_MNT_BASE}/${var_fs_btrfs_subvolume}]."
         do_log "info" "file_only" "3280() btrfs subvolid=0 created: '${var_mount_path}' on: '/dev/mapper/${var_encryption_label}'."
 
-        if [[ -n "${var_fs_btrfs_snapshot}" ]]; then
-          btrfs subvolume create "${VAR_SAFE_MNT_BASE}"/"${var_fs_btrfs_snapshot}" || return "${ERR_BTRFS_SUBVOL}"
-          do_log "info" "file_only" "3280() btrfs subvolid=${var_fs_btrfs_snapshot} created: '${var_mount_path}' on: '/dev/mapper/${var_encryption_label}'."
+        if [[ "${var_fs_btrfs_snapshot}" == "true" ]]; then
+
+          var_snapshot=$(get_label "${var_mount_path}" "${var_fs_version}" "snap")
+
+          btrfs subvolume create "${VAR_SAFE_MNT_BASE}/${var_snapshot}" || return "${ERR_BTRFS_SUBVOL}"
+          do_log "debug" "file_only" "3280() [btrfs subvolume create ${VAR_SAFE_MNT_BASE}/${var_snapshot}]."
+          do_log "info" "file_only" "3280() btrfs subvolid=${var_snapshot} created: '${var_mount_path}' on: '/dev/mapper/${var_encryption_label}'."
         fi
 
         umount "${VAR_SAFE_MNT_BASE}"
@@ -237,19 +256,32 @@ mount_partition() {
       case "${var_fs_version,,}:${var_encryption_enable,,}" in
 
         btrfs:*)
+
           validate_btrfs_compression "${var_fs_btrfs_compress}" "${var_fs_btrfs_level}" || return "${ERR_BTRFS_OPTION}"
+
           declare var_btrfs_compression_options="compress=${var_fs_btrfs_compress}:${var_fs_btrfs_level}"
-          [[ -n "${var_mount_options}" ]] && var_btrfs_compression_options+=",${var_mount_options}"
+
+          [[ -n "${var_mount_options}" ]] && var_btrfs_compression_options+=",${var_mount_options},subvol=${var_fs_btrfs_subvolume}"
+
           mount_with_dir "${var_mount_path}" "${var_resolved_dev}" "${var_btrfs_compression_options}" || return "${ERR_MOUNTING_DEV}"
-          if [[ -n "${var_fs_btrfs_snapshot}" ]]; then
+
+          if [[ "${var_fs_btrfs_snapshot}" == "true" ]]; then
+
             mkdir -p "${TARGET}${var_mount_path}/.snapshots"
+
             do_log "info" "file_only" "3280() Created: '${TARGET}${var_mount_path}/.snapshots'."
-            mount -o "${var_mount_optsnap}" "${var_resolved_dev}" "${TARGET}${var_mount_path}/.snapshots"
+
+            var_mount_optsnap="${var_mount_optsnap},subvol=${var_snapshot}"
+
+            mount_with_dir "${var_mount_path}/.snapshots" "${var_resolved_dev}" "${var_mount_optsnap}"
+
             do_log "info" "file_only" "3280() Mounted: '${var_resolved_dev}' on: '${TARGET}${var_mount_path}/.snapshots' (Options='${var_mount_optsnap}')."
+
           fi
           ;;
 
         ext4:*)
+
           mount_with_dir "${var_mount_path}" "${var_resolved_dev}" "${var_mount_options}" || return "${ERR_MOUNTING_DEV}"
           ;;
 
@@ -260,6 +292,8 @@ mount_partition() {
 
     done
 
+    lsblk -o NAME,MAJ:MIN,FSTYPE,FSVER,SIZE,UUID,MOUNTPOINT,PATH "/dev/${var_dev}" >| "${DIR_LOG}/${var_dev}_overview_full.log"
+
   done
 
   return 0