From 0546cf11ed4e4fd048be55a643650bc9895f5371 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Tue, 24 Jan 2023 11:11:37 +0100
Subject: [PATCH] add menu

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

diff --git a/usr/lib/archboot/installer/mountpoints.sh b/usr/lib/archboot/installer/mountpoints.sh
index 9ed10610b..13a4e4062 100644
--- a/usr/lib/archboot/installer/mountpoints.sh
+++ b/usr/lib/archboot/installer/mountpoints.sh
@@ -61,9 +61,9 @@ _select_filesystem() {
 }
 
 _enter_mountpoint() {
-    if [[ -n "${_DO_ROOT}" ]]; then
+    if [[ -n "${_ROOT_DEV}" ]]; then
         _MP="/"
-    elif [[ -n "${_DO_UEFISYSPART}" ]]; then
+    elif [[ -n "${_UEFISYSDEV}" ]]; then
         _dialog --menu "Select the mountpoint of your Efi System Partition (ESP) on ${_DEV}:" 15 50 12 /boot _ /efi _ 2>"${_ANSWER}" || return 1
         _MP=$(cat "${_ANSWER}")
     else
@@ -174,14 +174,14 @@ _mountpoints() {
             #shellcheck disable=SC2086
             if [[ -n ${_DO_ROOT} ]]; then
                 _dialog --menu "Select the device to mount as /:" 15 50 12 ${_DEVS} 2>"${_ANSWER}" || return 1
+                _DEV_ROOT=$(cat "${_ANSWER}")
             elif [[ -n ${_DO_UEFISYSDEV} ]]; then
                 _dialog --menu "Select the device to mount as Efi System Partition (ESP):" 15 50 12 ${_DEVS} 2>"${_ANSWER}" || return 1
+                _UEFISYSDEV=$(cat "${_ANSWER}")
             else
                 _dialog --menu "Select any additional devices to mount under your new root:" 15 52 12 ${_DEVS} DONE _ 2>"${_ANSWER}" || return 1
+                _DEV=$(cat "${_ANSWER}")
             fi
-            _DEV=$(cat "${_ANSWER}")
-            [[ -n ${_DO_ROOT} ]] && _DEV_ROOT=${_DEV}
-            [[ -n ${_DO_UEFISYSDEV} ]] && _UEFISYSDEV=${_DEV}
             if [[ "${_DEV}" != "DONE" ]]; then
                 _FSTYPE="$(${_LSBLK} FSTYPE "${_DEV}")"
                 # clear values first!