From 33a317dfb793aa1512de27c8b52dbc7a153dd5fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Lesimple?= <speed47_github@speed47.net>
Date: Tue, 4 Jan 2022 09:48:25 +0100
Subject: [PATCH] enh: use --raw for btrfs fi show when available

---
 btrfs-list | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/btrfs-list b/btrfs-list
index fd99b2e..76e52d2 100755
--- a/btrfs-list
+++ b/btrfs-list
@@ -402,7 +402,10 @@ devid    3 size 250.00MiB used 164.00MiB path /dev/loop3
 devid    4 size 250.00MiB used 164.00MiB path /dev/loop4
 =cut
 
-$cmd = run_cmd(fatal => 1, cmd => [qw{ btrfs filesystem show }, $wantedFs ? $wantedFs : ()]);
+$cmd = run_cmd(silent_stderr => 1, cmd => [qw{ btrfs filesystem show --raw }, $wantedFs ? $wantedFs : ()]);
+if (!@{$cmd->{stdout}} || $cmd->{status}) {
+    $cmd = run_cmd(fatal => 1, cmd => [qw{ btrfs filesystem show }, $wantedFs ? $wantedFs : ()]);
+}
 my ($label, $fuuid, %filesystems);
 foreach (@{$cmd->{stdout}}) {
     if (/^Label:\s+(\S+)\s+uuid:\s+([0-9a-f-]+)/) {