From 2c45c39e9bcc6d0e31f063e4422e17fab7bfd443 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Wed, 4 Mar 2020 13:52:34 +0100
Subject: cryptfs: do not -p check read-only file systems

---
 cryptfs.bin.in | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/cryptfs.bin.in b/cryptfs.bin.in
index 5516e5d..84d97a0 100644
--- a/cryptfs.bin.in
+++ b/cryptfs.bin.in
@@ -191,7 +191,13 @@ do_mount() {
 
   case "$(mount_details fs "$1")" in
     'ext'*)
-      e2fsck -p $(mount_details dev "$1")
+      if cryptsetup status $(mount_details dev "$1") \
+      | grep -q '^\s*mode:\s\+readonly$'; then
+        e2fsck_option='-n'
+      else
+        e2fsck_option='-p'
+      fi
+      e2fsck ${e2fsck_option} $(mount_details dev "$1")
     ;;
     'fuse.sshfs'|'fuse.ftps')
       local max_wait
-- 
cgit v1.2.3-54-g00ecf