From 017d33ac7b007d13f8c43a0a9c4f1e471b096730 Mon Sep 17 00:00:00 2001
From: Ole Tange <ole@tange.dk>
Date: Sun, 30 Jan 2022 16:48:47 +0100
Subject: [PATCH] cryptroot: More progress info.

---
 .../share/initramfs-tools/scripts/local-top/cryptroot  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ubuntu-20.04/usr/share/initramfs-tools/scripts/local-top/cryptroot b/ubuntu-20.04/usr/share/initramfs-tools/scripts/local-top/cryptroot
index 18216ef..a085ef4 100644
--- a/ubuntu-20.04/usr/share/initramfs-tools/scripts/local-top/cryptroot
+++ b/ubuntu-20.04/usr/share/initramfs-tools/scripts/local-top/cryptroot
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# Search for cryptkey.txt
+
 PREREQ="cryptroot-prepare"
 
 #
@@ -171,9 +173,11 @@ setup_mapping() {
 		echo -n "Searching for cryptkey.txt on available disks... "
 		local partition
 		for partition in `cat /proc/partitions |awk '{print $4}'|tail -n +3`; do
-		    if mount /dev/$partition /mnt 2>/dev/null; then
+		    echo -n " $partition"
+		    if mount -oro /dev/"$partition" /mnt 2>/dev/null; then
+			echo -n "(mounted)"
 			cat /mnt/cryptkey.txt >> /tmp/cryptkeys.txt 2>/dev/null
-			umount /dev/$partition
+			umount /dev/"$partition"
 		    fi
 		done
 		echo "done."
@@ -182,7 +186,7 @@ setup_mapping() {
 	    if [ -s /tmp/cryptkeys.txt ]; then
 		local keyfound
                 keyfound=0
-                echo Trying keys from cryptkey.txt
+                echo "Trying keys from cryptkey.txt for opening $CRYPTTAB_SOURCE as $CRYPTTAB_NAME"
                 for key in `cat /tmp/cryptkeys.txt`; do
                     if echo -n "$key" | unlock_mapping; then
                         # Found the key