From baaa7f6633bbf47c3453297eb871e101fa5090f0 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Tue, 10 Jan 2023 07:34:07 +0100
Subject: [PATCH] _FSTYPE is already defines

---
 usr/lib/archboot/installer/mountpoints.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/usr/lib/archboot/installer/mountpoints.sh b/usr/lib/archboot/installer/mountpoints.sh
index b51e0ddfc..9bd3b44be 100644
--- a/usr/lib/archboot/installer/mountpoints.sh
+++ b/usr/lib/archboot/installer/mountpoints.sh
@@ -169,10 +169,12 @@ _mountpoints() {
             # clear values first!
             _clear_fs_values
             _check_btrfs_filesystem_creation
+            # _ASK_MOUNTPOINTS switch for create filesystem and only mounting filesystem
+            # _SKIP_FILESYSTEM for btrfs
             if [[ -n "${_ASK_MOUNTPOINTS}" && -z "${_SKIP_FILESYSTEM}" ]]; then
                 _select_filesystem && _create_filesystem && _btrfs_subvolume
             else
-                if [[ "$(${_LSBLK} FSTYPE ${_PART_ROOT})" == "btrfs" ]]; then
+                if [[ "${_FSTYPE}" == "btrfs" ]]; then
                     _FSTYPE="btrfs"
                     _SKIP_FILESYSTEM=1
                     _btrfs_subvolume
@@ -200,18 +202,19 @@ _mountpoints() {
                     # clear values first!
                     _clear_fs_values
                     _check_btrfs_filesystem_creation
-                    # Select a filesystem type
+                    # _ASK_MOUNTPOINTS switch for create filesystem and only mounting filesystem
+                    # _SKIP_FILESYSTEM for btrfs
                     if [[ -n "${_ASK_MOUNTPOINTS}" && -z "${_SKIP_FILESYSTEM}" ]]; then
                         _enter_mountpoint && _select_filesystem && _create_filesystem && _btrfs_subvolume
                     else
                         _enter_mountpoint
-                        if [[ "$(${_LSBLK} FSTYPE ${_PART})" == "btrfs" ]]; then
+                        if [[ "${_FSTYPE}" == "btrfs" ]]; then
                             _FSTYPE="btrfs"
                             _SKIP_FILESYSTEM=1
                             _btrfs_subvolume
                         fi
                     fi
-                     _find_btrfs_raid_devices
+                    _find_btrfs_raid_devices
                     _btrfs_parts
                     _check_mkfs_values
                     echo "${_PART}:${_FSTYPE}:${_MP}:${_DOMKFS}:${_LABEL_NAME}:${_FS_OPTIONS}:${_BTRFS_DEVICES}:${_BTRFS_LEVEL}:${_BTRFS_SUBVOLUME}:${_DOSUBVOLUME}:${_BTRFS_COMPRESS}" >>/tmp/.parts