From 8e3dddb12eebe7a276eae419983fc981d46642df Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Tue, 29 Nov 2022 15:20:12 +0100
Subject: [PATCH] ask for name scheme earlier

---
 usr/lib/archboot/installer/autoprepare.sh | 7 +++----
 usr/lib/archboot/installer/mountpoints.sh | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/usr/lib/archboot/installer/autoprepare.sh b/usr/lib/archboot/installer/autoprepare.sh
index e1b34880b..af06eeed6 100644
--- a/usr/lib/archboot/installer/autoprepare.sh
+++ b/usr/lib/archboot/installer/autoprepare.sh
@@ -41,7 +41,9 @@ autoprepare() {
         DIALOG --msgbox "ERROR: Setup cannot detect size of your device, please use normal installation routine for partitioning and mounting devices." 0 0
         return 1
     fi
-
+    if [[ "${NAME_SCHEME_PARAMETER_RUN}" == "" ]]; then
+        set_device_name_scheme || return 1
+    fi
     if [[  "${GUIDPARAMETER}" = "yes" ]]; then
         DIALOG --inputbox "Enter the mountpoint of your UEFI SYSTEM PARTITION (Default is /boot) : " 10 60 "/boot" 2>"${ANSWER}" || return 1
         UEFISYS_MOUNTPOINT="$(cat "${ANSWER}")"
@@ -279,9 +281,6 @@ autoprepare() {
     ## wait until /dev initialized correct devices
     udevadm settle
 
-    if [[ "${NAME_SCHEME_PARAMETER_RUN}" == "" ]]; then
-        set_device_name_scheme || return 1
-    fi
     ## FSSPECS - default filesystem specs (the + is bootable flag)
     ## <partnum>:<mountpoint>:<partsize>:<fstype>[:<fsoptions>][:+]:labelname
     ## The partitions in FSSPECS list should be listed in the "mountpoint" order.
diff --git a/usr/lib/archboot/installer/mountpoints.sh b/usr/lib/archboot/installer/mountpoints.sh
index 6f66cbab9..f66846c10 100644
--- a/usr/lib/archboot/installer/mountpoints.sh
+++ b/usr/lib/archboot/installer/mountpoints.sh
@@ -234,7 +234,7 @@ mountpoints() {
         BTRFS_COMPRESS=$(echo "${line}" | cut -d: -f 11)
         if [[ "${DOMKFS}" = "yes" ]]; then
             if [[ "${FSTYPE}" = "swap" ]]; then
-                DIALOG --infobox "Creating and activating swapspace on ${PART} ..." 0 0
+                DIALOG --infobox "Creating and activating \nswapspace on \n${PART} ..." 0 0
             else
                 DIALOG --infobox "Creating ${FSTYPE} on ${PART},\nmounting to ${DESTDIR}${MP} ..." 0 0
             fi