diff mbox series

[isar-cip-core,v5,11/11] initramfs-crypt-hook: cleanup logging

Message ID 20240506141833.3622989-12-Quirin.Gylstorff@siemens.com (mailing list archive)
State Accepted
Headers show
Series Add option to encrypt the rootfs | expand

Commit Message

Quirin Gylstorff May 6, 2024, 2:17 p.m. UTC 
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Reduce the clutter during boot. Print messages only if debug is
set in the commandline.
Use the provided logging functionality.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 .../initramfs-crypt-hook/files/encrypt_partition.script   | 8 ++++++--
 .../files/mount_crypt_partitions.script                   | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.script b/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.script
index d9a85e5..d48db94 100644
--- a/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.script
+++ b/recipes-initramfs/initramfs-crypt-hook/files/encrypt_partition.script
@@ -78,7 +78,7 @@  reencrypt_existing_partition() {
 		fi
 		;;
 	squashfs|"")
-		echo "skip disk resize as it is not supported or unnecessary for fstype: '$partition_fstype'"
+		[ "$debug" = "y" ] && echo "skip disk resize as it is not supported or unnecessary for fstype: '$partition_fstype'"
 		;;
 	*)
 		panic "cannot resize parition. unsupport fstype: $partition_fstype"
@@ -112,7 +112,7 @@  done
 
 if [ ! -e "$tpm_device" ]; then
 	if [ "$tpm_encryption_optional" = "true" ]; then
-		echo "No tpm_device exists abort optional encryption"
+		log_warning_msg "No tpm_device exists abort optional encryption"
 		exit 0
 	fi
 	panic "No tpm device exists or supports pcr_hash '$pcr_bank_hash_type' or '$tpm_key_algorithm' - cannot create a encrypted device!"
@@ -167,16 +167,20 @@  for partition_set in $partition_sets; do
 
 	case "${partition_format}" in
 		"reencrypt")
+			log_begin_msg "Encryption of ${part_device}"
 			reencrypt_existing_partition "$part_device" "$tmp_key"
 			enroll_tpm2_token "$part_device" "$tmp_key" "$tpm_device" "$tpm_key_algorithm" "$pcr_bank_hash_type"
 			open_tpm2_partition "$part_device" "$crypt_mount_name" "$tpm_device"
+			log_end_msg
 		;;
 		"format")
+			log_begin_msg "Encryption of ${part_device}"
 			/usr/sbin/cryptsetup luksFormat --batch-mode \
 				 --type luks2 "$partition" < "$tmp_key"
 			enroll_tpm2_token "$part_device" "$tmp_key" "$tpm_device" "$tpm_key_algorithm" "$pcr_bank_hash_type"
 			open_tpm2_partition "$part_device" "$crypt_mount_name" "$tpm_device"
 			eval "${create_file_system_cmd} ${decrypted_part}"
+			log_end_msg
 		;;
 		*)
 			panic "Unknown value ${partition_format}. Cannot create a encrypted partition !"
diff --git a/recipes-initramfs/initramfs-crypt-hook/files/mount_crypt_partitions.script b/recipes-initramfs/initramfs-crypt-hook/files/mount_crypt_partitions.script
index f35685e..f47219b 100644
--- a/recipes-initramfs/initramfs-crypt-hook/files/mount_crypt_partitions.script
+++ b/recipes-initramfs/initramfs-crypt-hook/files/mount_crypt_partitions.script
@@ -35,7 +35,7 @@  esac
 mount_partition() {
 	partition_dev_path=$1
 	partition_mountpoint=$2
-	echo "mount device: '$partition_dev_path' to '$partition_mountpoint'"
+	[ "$debug" = "y" ] && echo "mount device: '$partition_dev_path' to '$partition_mountpoint'"
 	if ! mountpoint -q "${partition_mountpoint}"; then
 		if ! mount -t "$(get_fstype "${partition_dev_path}")" "${partition_dev_path}" \
 			 "${partition_mountpoint}"; then