V8.00.000.2025.06.17

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

func/system/4060_generate_crypttab.sh

@@ -25,9 +25,9 @@ guard_sourcing
 #   0: on success
 #######################################
 write_crypttab() {
-  declare _label="$1" _device="$2" _key_file="$3" _opts="$4"
-  printf "%s %s %s %s\n" "${_label}" "${_device}" "${_key_file}" "${_opts}" >> "${TARGET}/etc/crypttab"
-  do_log "info" "file_only" "4060() crypttab entry generated: [${_label} ${_device} ${_key_file} ${_opts}]."
+  declare write_label="$1" write_dev="$2" write_key_file="$3" write_opts="$4"
+  printf "%-43s %-45s %-29s %s\n" "${write_label}" "${write_dev}" "${write_key_file}" "${write_opts}" >> "${TARGET}/etc/crypttab"
+  do_log "info" "file_only" "4060() crypttab entry generated: [${write_label} ${write_dev} ${write_key_file} ${write_opts}]."
   return 0
 }
 
@@ -35,8 +35,8 @@ write_crypttab() {
 # Generate target '/etc/crypttab' entries.
 # Globals:
 #   HMP_EPHEMERAL_ENCLABEL
-#   HMP_EPHEMERAL_FS_LABEL
 #   HMP_PATH_ENCLABEL
+#   HMP_PATH_FSUUID
 #   HMP_PATH_LUKSUUID
 #   TARGET
 #   VAR_NUKE
@@ -47,10 +47,10 @@ write_crypttab() {
 #   0: on success
 #######################################
 generate_crypttab() {
-  declare var_key var_encryption_label var_luks_uuid
+  ### Declare Arrays, HashMaps, and Variables.
+  declare     var_key="" var_encryption_label="" var_luks_uuid="" var_ephemeral_enclabel="" var_host_uuid=""
 
   ### Generate '${TARGET}/etc/crypttab' header.
-  install -d -m 0755 "${TARGET}/etc"
   : >| "${TARGET}/etc/crypttab"
   chmod 0600 "${TARGET}/etc/crypttab"
 
@@ -66,7 +66,7 @@ generate_crypttab() {
 # SPDX-PackageName: CISS.debian.installer
 # SPDX-Security-Contact: security@coresecret.eu
 
-# /etc/crypttab: static file system information.
+# Static file system information: '/etc/crypttab'.
 #
 # Basic rule: 'discard' / 'nodiscard' are normally only set in '/etc/crypttab' when LUKS/dm-crypt is in use. Options like
 # 'discard=async' or similar are typically only set in '/etc/fstab' (at the file system level). The crypttab determines whether
@@ -77,13 +77,11 @@ generate_crypttab() {
 # not specify discard in the '/etc/crypttab', dm-crypt blocks TRIM by default. This would render a discard in the '/etc/fstab'
 # ineffective.
 #
-# <name>                                   <device>       <password-file-or-none>        <options>
+# <name>                                   <device>                                      <password-file-or-none>       <options>
 
 EOF
 
   ### Generate '${TARGET}/etc/crypttab' entries.
-  declare var_ephemeral_enclabel var_ephemeral_fs_label
-
   for var_key in "${!HMP_PATH_LUKSUUID[@]}"; do
 
     var_encryption_label="${HMP_PATH_ENCLABEL["${var_key}"]}"
@@ -112,14 +110,14 @@ EOF
   for var_key in "${!HMP_EPHEMERAL_ENCLABEL[@]}"; do
 
     var_ephemeral_enclabel="${HMP_EPHEMERAL_ENCLABEL["${var_key}"]}"
-    var_ephemeral_fs_label="${HMP_EPHEMERAL_FS_LABEL["${var_key}"]}"
+    var_host_uuid="${HMP_PATH_FSUUID["${var_key}"]}"
 
     case "${var_key}" in
       SWAP)
-        write_crypttab "${var_ephemeral_enclabel}" "LABEL=${var_ephemeral_fs_label}" "/dev/random" "swap,offset=2048,cipher=aes-xts-plain64,size=512,sector-size=4096"
+        write_crypttab "${var_ephemeral_enclabel}" "UUID=${var_host_uuid}" "/dev/random" "swap,offset=2048,cipher=aes-xts-plain64,size=512,sector-size=4096"
         ;;
       /tmp)
-        write_crypttab "${var_ephemeral_enclabel}" "LABEL=${var_ephemeral_fs_label}" "/dev/random" "offset=2048,cipher=aes-xts-plain64,size=512,sector-size=4096,tmp=ext4"
+        write_crypttab "${var_ephemeral_enclabel}" "UUID=${var_host_uuid}" "/dev/random" "offset=2048,cipher=aes-xts-plain64,size=512,sector-size=4096,tmp=ext4"
         ;;
       *)
         do_log "error" "file_only" "Only 'SWAP' and '/tmp' are valid Partitions for Ephemeral Encryption. Given value was: '${var_key}'."