root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge swap into mountpoints

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-25 15:35:57 +01:00
parent db710c445d
commit d7ab201930
1 changed files with 17 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
usr/lib/archboot/installer/mountpoints.sh
View file

@ -63,6 +63,7 @@ _select_filesystem() {
_enter_mountpoint() { _enter_mountpoint() {
if [[ -n "${_DO_ROOT}" ]]; then if [[ -n "${_DO_ROOT}" ]]; then
_MP="/" _MP="/"
_DO_ROOT=""
elif [[ -n "${_DO_UEFISYSDEV}" ]]; then elif [[ -n "${_DO_UEFISYSDEV}" ]]; then
_dialog --menu "Select the mountpoint of your\nEFI SYSTEM PARTITION (ESP) on ${_DEV}:" 10 50 7 "/efi" "MULTIBOOT" "/boot" "SINGLEBOOT" 2>"${_ANSWER}" || return 1 _dialog --menu "Select the mountpoint of your\nEFI SYSTEM PARTITION (ESP) on ${_DEV}:" 10 50 7 "/efi" "MULTIBOOT" "/boot" "SINGLEBOOT" 2>"${_ANSWER}" || return 1
_MP=$(cat "${_ANSWER}") _MP=$(cat "${_ANSWER}")
@ -150,35 +151,14 @@ _mountpoints() {
fi fi
_dialog --infobox "Scanning blockdevices... This may need some time." 3 60 _dialog --infobox "Scanning blockdevices... This may need some time." 3 60
_DEVS=$(_finddevices) _DEVS=$(_finddevices)
# _DO_SWAP="1"
# swap setting
#
#shellcheck disable=SC2086
_dialog --menu "Select the SWAP device:" 15 45 12 NONE - ${_DEVS} 2>"${_ANSWER}" || return 1
_DEV=$(cat "${_ANSWER}")
_FSTYPE="$(${_LSBLK} FSTYPE "${_DEV}")"
if [[ "${_DEV}" != "NONE" ]]; then
_clear_fs_values
# create swap if not already swap formatted
if [[ -n "${_ASK_MOUNTPOINTS}" && ! "${_FSTYPE}" == "swap" ]]; then
_DOMKFS=1
_FSTYPE="swap"
_create_filesystem || return 1
fi
fi
if [[ "${_DEV}" != "NONE" ]]; then
_check_mkfs_values
_DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${_DEV}")/}"
echo "${_DEV}:swap:swap:${_DOMKFS}:${_LABEL_NAME}:${_FS_OPTIONS}:${_BTRFS_DEVS}:${_BTRFS_LEVEL}:${_BTRFS_SUBVOLUME}:${_BTRFS_COMPRESS}" >>/tmp/.parts
fi
#
# mountpoints setting
#
_DO_ROOT="1" _DO_ROOT="1"
[[ -n ${_UEFI_BOOT} ]] && _DO_UEFISYSDEV=1 [[ -n ${_UEFI_BOOT} ]] && _DO_UEFISYSDEV=1
while [[ "${_DEV}" != "DONE" ]]; do while [[ "${_DEV}" != "DONE" ]]; do
#shellcheck disable=SC2086 #shellcheck disable=SC2086
if [[ -n "${_DO_ROOT}" ]]; then if [[ -n "${_DO_SWAP}" ]]; then
_dialog --menu "Select the SWAP device:" 15 45 12 NONE - ${_DEVS} 2>"${_ANSWER}" || return 1
elif [[ -n "${_DO_ROOT}" ]]; then
_dialog --menu "Select the ROOT DEVICE /:" 15 45 12 ${_DEVS} 2>"${_ANSWER}" || return 1 _dialog --menu "Select the ROOT DEVICE /:" 15 45 12 ${_DEVS} 2>"${_ANSWER}" || return 1
elif [[ -n "${_DO_UEFISYSDEV}" ]]; then elif [[ -n "${_DO_UEFISYSDEV}" ]]; then
_dialog --menu "Select the EFI SYSTEM PARTITION (ESP):" 15 45 12 ${_DEVS} 2>"${_ANSWER}" || return 1 _dialog --menu "Select the EFI SYSTEM PARTITION (ESP):" 15 45 12 ${_DEVS} 2>"${_ANSWER}" || return 1
@ -186,13 +166,23 @@ _mountpoints() {
_dialog --menu "Select any additional devices:" 15 45 12 ${_DEVS} DONE _ 2>"${_ANSWER}" || return 1 _dialog --menu "Select any additional devices:" 15 45 12 ${_DEVS} DONE _ 2>"${_ANSWER}" || return 1
fi fi
_DEV=$(cat "${_ANSWER}") _DEV=$(cat "${_ANSWER}")
[[ "${_DEV}" == "NONE" ]] && _DO_SWAP=""
if [[ "${_DEV}" != "DONE" ]]; then if [[ "${_DEV}" != "DONE" ]]; then
_FSTYPE="$(${_LSBLK} FSTYPE "${_DEV}")" _FSTYPE="$(${_LSBLK} FSTYPE "${_DEV}")"
# clear values first! # clear values first!
_clear_fs_values _clear_fs_values
_check_btrfs_filesystem_creation _check_btrfs_filesystem_creation
if [[ -n ${_DO_SWAP} ]]; then
_MP="swap"
# create swap if not already swap formatted
if [[ -n "${_ASK_MOUNTPOINTS}" && ! "${_FSTYPE}" == "swap" ]]; then
_DOMKFS=1
_FSTYPE="swap"
fi
_DO_SWAP=""
fi
# reformat device, if already swap partition format # reformat device, if already swap partition format
if [[ -n "${_ASK_MOUNTPOINTS}" && "${_FSTYPE}" == "swap" ]]; then if [[ -n "${_ASK_MOUNTPOINTS}" && "${_FSTYPE}" == "swap" && -z "${_DO_SWAP}" ]]; then
_FSTYPE="" _FSTYPE=""
_DOMKFS=1 _DOMKFS=1
fi fi
@ -231,8 +221,7 @@ _mountpoints() {
_check_mkfs_values _check_mkfs_values
echo "${_DEV}:${_FSTYPE}:${_MP}:${_DOMKFS}:${_LABEL_NAME}:${_FS_OPTIONS}:${_BTRFS_DEVS}:${_BTRFS_LEVEL}:${_BTRFS_SUBVOLUME}:${_BTRFS_COMPRESS}" >>/tmp/.parts echo "${_DEV}:${_FSTYPE}:${_MP}:${_DOMKFS}:${_LABEL_NAME}:${_FS_OPTIONS}:${_BTRFS_DEVS}:${_BTRFS_LEVEL}:${_BTRFS_SUBVOLUME}:${_BTRFS_COMPRESS}" >>/tmp/.parts
# always remove root device # always remove root device
[[ ! "${_FSTYPE}" == "btrfs" || -n "${_DO_ROOT}" ]] && _DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${_DEV}")/}" [[ ! "${_FSTYPE}" == "btrfs" || -n "${_DO_ROOT}" ]] && _DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${_DEV}")/}"
_DO_ROOT=""
fi fi
done done
#shellcheck disable=SC2028 #shellcheck disable=SC2028