From 17ff3e33c39ea86c5103753d4bf3ba72da70dfe0 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Wed, 25 Jan 2023 18:41:14 +0100
Subject: [PATCH] add another loop

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

diff --git a/usr/lib/archboot/installer/mountpoints.sh b/usr/lib/archboot/installer/mountpoints.sh
index f18c76249..742fa26ca 100644
--- a/usr/lib/archboot/installer/mountpoints.sh
+++ b/usr/lib/archboot/installer/mountpoints.sh
@@ -214,10 +214,15 @@ _mountpoints() {
                             [[ "${_FSTYPE}" == "vfat" ]] && _FSTYPE=""
                         fi
                     else
-                        if [[ -n "${_DO_SWAP}" && ! "${_DEV}" == "NONE" ]]; then
-                            if ! [[ "${_FSTYPE}" == "swap" ]]; then
-                                _dialog --msgbox "Error: SWAP PARTITION has not a swap filesystem." 5 50
-                                _FS_FAILED=1
+                        if [[ -n "${_DO_SWAP}" ]]; then
+                            if ! [[ "${_DEV}" == "NONE" ]]; then
+                                if ! [[ "${_FSTYPE}" == "swap" ]]; then
+                                    _dialog --msgbox "Error: SWAP PARTITION has not a swap filesystem." 5 50
+                                    _FS_FAILED=1
+                                else
+                                    _DO_SWAP=""
+                                    _FS_FAILED=""
+                                fi
                             else
                                 _DO_SWAP=""
                                 _FS_FAILED=""