Try both Clevis and passphrase in /etc/fstab setup

stratis-storage · Jan 9, 2024 · 492a89e · 492a89e
1 parent aa492c2
commit 492a89e
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/systemd/stratis-fstab-setup b/systemd/stratis-fstab-setup
@@ -19,23 +19,29 @@ done
 
 if $(stratis-min pool is-stopped "$POOL_UUID"); then
 	if $(stratis-min pool is-bound "$POOL_UUID"); then
-		if ! stratis-min pool start --unlock-method=clevis "$POOL_UUID"; then
+		if stratis-min pool start --unlock-method=clevis "$POOL_UUID"; then
+			exit 0
+		else
 			echo Failed to start pool with UUID $POOL_UUID using Clevis. >&2
-			exit 1
 		fi
-	elif $(stratis-min pool is-encrypted "$POOL_UUID"); then
-		if ! systemd-ask-password \
+	fi
+	if $(stratis-min pool has-passphrase "$POOL_UUID"); then
+		if systemd-ask-password \
 			"Enter password for pool with UUID $POOL_UUID" |
 			stratis-min pool start --unlock-method=keyring --prompt "$POOL_UUID"; then
+			exit 0
+		else
 			echo Failed to start pool with UUID $POOL_UUID using passphrase. >&2
-			exit 1
 		fi
-	else
-		if ! stratis-min pool start "$POOL_UUID"; then
+	fi
+	if ! $(stratis-min pool is-encrypted); then
+		if stratis-min pool start "$POOL_UUID"; then
+			exit 0
+		else
 			echo Failed to start pool with UUID $POOL_UUID. >&2
-			exit 1
 		fi
 	fi
+	exit 1
 fi
 
 udevadm settle