From 58d7c9eefda3f7aa4d99ee425f8f0cab660f81c7 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Tue, 10 Jan 2023 22:39:06 +0100
Subject: [PATCH] other logic

---
 usr/lib/archboot/installer/mountpoints.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/usr/lib/archboot/installer/mountpoints.sh b/usr/lib/archboot/installer/mountpoints.sh
index 31c3408d7..7c30668a7 100644
--- a/usr/lib/archboot/installer/mountpoints.sh
+++ b/usr/lib/archboot/installer/mountpoints.sh
@@ -172,7 +172,7 @@ _mountpoints() {
             # _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
+                _select_filesystem && _create_filesystem
             else
                 if [[ "${_FSTYPE}" == "btrfs" ]]; then
                     _FSTYPE="btrfs"
@@ -205,11 +205,10 @@ _mountpoints() {
                     # _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
+                        _enter_mountpoint && _select_filesystem && _create_filesystem
                     else
                         _enter_mountpoint
                         if [[ "${_FSTYPE}" == "btrfs" ]]; then
-                            _FSTYPE="btrfs"
                             _SKIP_FILESYSTEM=1
                             _btrfs_subvolume
                         fi