From 1556c345dac23c1f13ca6470c7ff68a22d56971c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20J=C3=A4ger?= <pascal.jaeger@leimstift.de>
Date: Sun, 26 Mar 2023 19:00:27 +0200
Subject: [PATCH] grub-btrfs: Do root fs detection with btrfs progs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix: #266 #255

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
---
 41_snapshots-btrfs | 2 +-
 config             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/41_snapshots-btrfs b/41_snapshots-btrfs
index 9dd11a0..9f3a742 100755
--- a/41_snapshots-btrfs
+++ b/41_snapshots-btrfs
@@ -76,7 +76,7 @@ done
 [[ "${GRUB_BTRFS_DISABLE,,}" == "true" ]] && print_error "GRUB_BTRFS_DISABLE is set to true (default=false)"
 if ! type btrfs >/dev/null 2>&1; then print_error "btrfs-progs isn't installed"; fi
 [[ -f "${GRUB_BTRFS_MKCONFIG_LIB:-/usr/share/grub/grub-mkconfig_lib}" ]] && . "${GRUB_BTRFS_MKCONFIG_LIB:-/usr/share/grub/grub-mkconfig_lib}" || print_error "grub-mkconfig_lib couldn't be found"
-[[ "$(${grub_probe} --target="fs" / 2>/dev/null)" != "btrfs" ]] && print_error "Root filesystem isn't btrfs"
+[[ "$(btrfs filesystem df / 2>&1)" == *"not a btrfs filesystem"* ]] && print_error "Root filesystem isn't btrfs"
 
 printf "Detecting snapshots ...\n" >&2 ;
 
diff --git a/config b/config
index 83ad309..6553a33 100644
--- a/config
+++ b/config
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 
-GRUB_BTRFS_VERSION=4.12-improve-config-2022-12-06T22:10:24+00:00
+GRUB_BTRFS_VERSION=4.12-HEAD-2023-03-26T17:44:56+00:00
 
 # Disable grub-btrfs.
 # Default: "false"