From a5c0745d09b93b4350d867ae3c6e92f0f65bfab8 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Wed, 1 Apr 2020 09:12:40 +0200
Subject: [PATCH] bkctld-check: use findmnt instead of grep + check "rw" for
 backup disk

---
 lib/bkctld-check | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/bkctld-check b/lib/bkctld-check
index bf3da86..a048931 100755
--- a/lib/bkctld-check
+++ b/lib/bkctld-check
@@ -15,6 +15,7 @@ nb_unkn=0
 output=""
 
 if [ -b "${BACKUP_DISK}" ]; then
+    # If backup disk is encrypted, verify that it's open
     cryptsetup isLuks "${BACKUP_DISK}"
     if [ "$?" -eq 0 ]; then
         if [ ! -b '/dev/mapper/backup' ]; then
@@ -22,11 +23,13 @@ if [ -b "${BACKUP_DISK}" ]; then
             echo "cryptsetup luksOpen ${BACKUP_DISK} backup"
             exit 2
         fi
+        # Change value to real device
         BACKUP_DISK='/dev/mapper/backup'
     fi
-    grep -qE "^${BACKUP_DISK} " /etc/mtab
+    # Verify that it's mounted and writable
+    findmnt --source ${BACKUP_DISK} -O rw > /dev/null
     if [ "$?" -ne 0 ]; then
-         echo "Backup disk ${BACKUP_DISK} is not mounted !\n"
+         echo "Backup disk ${BACKUP_DISK} is not mounted (or read-only) !\n"
          echo "mount ${BACKUP_DISK} /backup"
          exit 2
     fi