From 3fb5a52c5e0b0e43238f5b065b5393965e4022a1 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Mon, 29 Jul 2024 08:54:56 +0200
Subject: [PATCH] fix btrfsraid scanning functions

---
 usr/lib/archboot/installer/btrfs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/lib/archboot/installer/btrfs.sh b/usr/lib/archboot/installer/btrfs.sh
index 9e315b40b..c7df4deff 100644
--- a/usr/lib/archboot/installer/btrfs.sh
+++ b/usr/lib/archboot/installer/btrfs.sh
@@ -23,7 +23,7 @@ _umount_btrfs() {
 _find_btrfsraid_devices() {
     _btrfs_scan
     if [[ -z "${_DETECT_CREATE_FILESYSTEM}" && "${_FSTYPE}" == "btrfs" ]]; then
-        for i in $(btrfs filesystem show "${_DEV}" | choose 10); do
+        for i in $(btrfs filesystem show "${_DEV}" | rg -o ' (/dev/.*)' -r '$1'); do
             _BTRFS_DEVS="${_BTRFS_DEVS}#${i}"
         done
     fi
@@ -34,7 +34,7 @@ _find_btrfsraid_bootloader_devices() {
     _BTRFS_COUNT=1
     if [[ "$(${_LSBLK} FSTYPE "${_BOOTDEV}")" == "btrfs" ]]; then
         _BTRFS_DEVS=""
-        for i in $(btrfs filesystem show "${_BOOTDEV}" | choose 10); do
+        for i in $(btrfs filesystem show "${_BOOTDEV}" | rg -o ' (/dev/.*)' -r '$1'); do
             _BTRFS_DEVS="${_BTRFS_DEVS}#${i}"
             _BTRFS_COUNT=$((_BTRFS_COUNT+1))
         done