From fa6b2143d0036db10cf4da5500cd1d27ec29fbc1 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 1 Apr 2021 12:05:24 +0200
Subject: [ntfsfree] dmsetup wait retry, log its output

---
 core/modules/ntfsfree/data/opt/openslx/scripts/thinpool-grow | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'core/modules/ntfsfree')

diff --git a/core/modules/ntfsfree/data/opt/openslx/scripts/thinpool-grow b/core/modules/ntfsfree/data/opt/openslx/scripts/thinpool-grow
index e735fa45..7ed678f7 100755
--- a/core/modules/ntfsfree/data/opt/openslx/scripts/thinpool-grow
+++ b/core/modules/ntfsfree/data/opt/openslx/scripts/thinpool-grow
@@ -119,7 +119,7 @@ exit_hook() {
 	[ -n "$HAVE_LOCK" ] && unlock
 }
 
-trap exit_hook EXIT TERM INT
+trap exit_hook EXIT
 
 # Try to grow via NTFS volume
 # Must honor and update $current_data_sz, and echo into $new_table
@@ -335,7 +335,9 @@ elif [ "$MODE" = "wait" ]; then
 		else
 			(( next++ ))
 		fi
-		dmsetup wait "$POOL" "$next" || break
+		dmsetup wait "$POOL" "$next" &>> "$DEBUG_FILE" \
+			|| dmsetup wait "$POOL" "$next" &>> "$DEBUG_FILE" \
+			|| break
 	done
 	debug "Error in dmsetup wait"
 	exit 1
-- 
cgit v1.2.3-55-g7522