From 1bf77bf482c89ac0cd1dbb098130201ac311deef Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Wed, 25 Jan 2023 17:24:51 +0100
Subject: [PATCH] add only mounting code

---
 usr/lib/archboot/installer/mountpoints.sh | 46 ++++++++++++++++-------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/usr/lib/archboot/installer/mountpoints.sh b/usr/lib/archboot/installer/mountpoints.sh
index eab2a2351..34fd1e1bb 100644
--- a/usr/lib/archboot/installer/mountpoints.sh
+++ b/usr/lib/archboot/installer/mountpoints.sh
@@ -183,27 +183,47 @@ _mountpoints() {
                 if [[ -n ${_DO_SWAP} && "${_FSTYPE}" == "swap" || "${_DEV}" == "NONE" ]]; then
                     _SKIP_FILESYSTEM=1
                 fi
-                # reformat device, if already swap partition format
-                if [[  -n "${_ASK_MOUNTPOINTS}" && "${_FSTYPE}" == "swap" && -z "${_DO_SWAP}" ]]; then
-                    _FSTYPE=""
-                    _DOMKFS=1
-                fi
-                # reformat vfat, root cannot be vfat format
-                if [[  -n "${_ASK_MOUNTPOINTS}" && -n "${_DO_ROOT}" && -z "${_DO_SWAP}" ]]; then
-                    if [[ "${_FSTYPE}" == "vfat" ]]; then
+                # _ASK_MOUNTPOINTS switch for create filesystem and only mounting filesystem
+                if [[  -n "${_ASK_MOUNTPOINTS}" ]]; then
+                    # reformat device, if already swap partition format
+                    if [[  "${_FSTYPE}" == "swap" && -z "${_DO_SWAP}" ]]; then
                         _FSTYPE=""
                         _DOMKFS=1
                     fi
+                    # reformat vfat, root cannot be vfat format
+                    if [[ -n "${_DO_ROOT}" && -z "${_DO_SWAP}" ]]; then
+                        if [[ "${_FSTYPE}" == "vfat" ]]; then
+                            _FSTYPE=""
+                            _DOMKFS=1
+                        fi
+                    fi
+                    # create vfat on ESP, if not already vfat format
+                    if [[ ! "${_FSTYPE}" == "vfat" && -n "${_DO_UEFISYSDEV}" && -z "${_DO_ROOT}" ]]; then
+                        _FSTYPE="vfat"
+                        _DOMKFS=1
+                    fi
+                else
+                    if [[ -n "${_DO_SWAP}" ]]; then
+                        if ! [[ "${_FSTYPE}" == "swap" ]]; then
+                            return 1
+                        else
+                            _DO_SWAP=""
+                        fi
+                    elif [[ -n "${_DO_ROOT}" ]]; then
+                            _DO_ROOT=""
+                    elif [[ -n "${_DO_UEFISYSDEV}" ]]; then
+                        if ! [[ "${_FSTYPE}" == "vfat" ]]; then
+                            return 1
+                        else
+                            _DO_UEFISYSDEV=""
+                        fi
+                    fi
+                    _SKIP_FILESYSTEM=1
                 fi
                 # don't format ESP, if already vfat format
                 if [[ "${_FSTYPE}" == "vfat" && -n "${_DO_UEFISYSDEV}" && -z "${_DO_ROOT}" ]]; then
                     _SKIP_FILESYSTEM="1"
                 fi
-                # create vfat on ESP, if not already vfat format
-                if [[ -n "${_ASK_MOUNTPOINTS}" && ! "${_FSTYPE}" == "vfat" && -n "${_DO_UEFISYSDEV}" && -z "${_DO_ROOT}" ]]; then
-                    _FSTYPE="vfat"
-                    _DOMKFS=1
-                fi
                 # allow reformat. if already vfat format
                 if [[ -z "${_DO_UEFISYSDEV}" && -z "${_DO_ROOT}" ]]; then
                     [[ "${_FSTYPE}" == "vfat" ]] && _FSTYPE=""