From 72e9cd3e0bfdd1625bf6c18afa0dabf3bab556ab Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Wed, 4 Mar 2020 13:50:51 +0100
Subject: cryptfs: verbose errors

---
 cryptfs.bin.in | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/cryptfs.bin.in b/cryptfs.bin.in
index d9a358f..5516e5d 100644
--- a/cryptfs.bin.in
+++ b/cryptfs.bin.in
@@ -217,6 +217,8 @@ do_mount() {
   max_tries=10
   mount_parameters=$(mount_details all "$1")
   while ! mount ${mount_parameters}; do
+    >&2 printf '"mount %s" failed.\n' \
+      "${mount_parameters}"
     max_tries=$((max_tries-1))
     if [ ${max_tries} -le 0 ]; then
       exit 1
@@ -247,6 +249,8 @@ do_unmount() {
   fi
   mount_point=$(mount_details mp "$1")
   while ! umount ${lazy} "${mount_point}"; do
+    >&2 printf '"umount %s" failed.\n' \
+      "${lazy} ${mount_point}"
     fuser -k -M -m "${mount_point}"
     sleep 1
   done
@@ -258,6 +262,8 @@ do_unmount() {
 do_crypt_close() {
   if is_unlocked "$1"; then
     while ! cryptsetup luksClose "$1"; do
+      >&2 printf '"cryptsetup luksClose %s" failed.\n' \
+        "$1"
       sleep 1
     done
   fi
@@ -275,6 +281,8 @@ do_crypt_open() {
   if ! is_unlocked "${name}"; then
     max_tries=10
     while ! cryptsetup luksOpen "${raw}" "${name}" --key-file="${key}" "$@"; do
+      >&2 printf '"cryptsetup luksOpen %s %s --key-file=%s %s" failed.\n' \
+        "${raw}" "${name}" "${key}" "$*"
       sleep 1
       max_tries=$((max_tries-1))
       if [ ${max_tries} -le 0 ]; then
@@ -287,6 +295,8 @@ do_crypt_open() {
 do_integrity_close() {
   if is_unlocked "$1"; then
     while ! integritysetup close "$1" && ! dmsetup remove "$1"; do
+      >&2 printf '"integritysetup close %s || dmsetup remove %s" failed.\n' \
+        "$1" "$1"
       sleep 1
     done
   fi
@@ -300,6 +310,8 @@ do_integrity_open() {
   if ! is_unlocked "${name}"; then
     max_tries=10
     while ! integritysetup open "${raw}" "${name}"; do
+      >&2 printf '"integritysetup open %s %s" failed.\n' \
+        "${raw}" "${name}"
       sleep 1
       max_tries=$((max_tries-1))
       if [ ${max_tries} -le 0 ]; then
-- 
cgit v1.2.3-70-g09d2