From 6a90a57f5c8c0fe23029d2df5e9da981dbd10455 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Wed, 25 Jan 2023 07:10:26 +0100
Subject: [PATCH] add SWAP and ROOT DEVICE

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

diff --git a/CHANGELOG b/CHANGELOG
index f21c4e6c1..b860f67e4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,10 +13,11 @@ setup:
 - added Unified Kernel Image suppport in EFISTUB menu
 - new efibootmgr routine
 - new systemd compliant mounting dialogs with /efi or /boot as ESP
-- don't allow formatting of existing ESP in mountpoints
+- don't format already existing ESP
+- don't format already existing swap partition
 - Auto-Prepare mode is systemd-gpt-auto-generator compliant now
 - disable unsafe menu entries on installed system
-- don't show install message in installed system
+- don't show install message on installed system
 - added new menu title if running on installed system
 - fixed automounted ESP and /boot detection on installed systems
 - don't ask for network, sources and mkfs on installed sytems
diff --git a/usr/lib/archboot/installer/mountpoints.sh b/usr/lib/archboot/installer/mountpoints.sh
index 4fe9582cd..0a80e598b 100644
--- a/usr/lib/archboot/installer/mountpoints.sh
+++ b/usr/lib/archboot/installer/mountpoints.sh
@@ -155,7 +155,7 @@ _mountpoints() {
         # swap setting
         #
         #shellcheck disable=SC2086
-        _dialog --menu "Select the device to use as swap:" 15 50 12 NONE - ${_DEVS} 2>"${_ANSWER}" || return 1
+        _dialog --menu "Select the device to use as SWAP:" 15 50 12 NONE - ${_DEVS} 2>"${_ANSWER}" || return 1
         _DEV=$(cat "${_ANSWER}")
         _FSTYPE="$(${_LSBLK} FSTYPE "${_DEV}")"
         if [[ "${_DEV}" != "NONE" ]]; then
@@ -181,7 +181,7 @@ _mountpoints() {
         while [[ "${_DEV}" != "DONE" ]]; do
             #shellcheck disable=SC2086
             if [[ -n "${_DO_ROOT}" ]]; then
-                _dialog --menu "Select the device to mount as /:" 15 50 12 ${_DEVS} 2>"${_ANSWER}" || return 1
+                _dialog --menu "Select the device to mount as ROOT DEVICE /:" 15 50 12 ${_DEVS} 2>"${_ANSWER}" || return 1
             elif [[ -n "${_DO_UEFISYSDEV}" ]]; then
                 _dialog --menu "Select the device to mount as\nEFI SYSTEM PARTITION (ESP):" 15 40 12 ${_DEVS} 2>"${_ANSWER}" || return 1
             else