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

add menu

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-24 11:15:06 +01:00
parent 0546cf11ed
commit 06a0165bf3
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,9 +61,9 @@ _select_filesystem() {
} }
_enter_mountpoint() { _enter_mountpoint() {
if [[ -n "${_ROOT_DEV}" ]]; then if [[ -n "${_DO_ROOT}" ]]; then
_MP="/" _MP="/"
elif [[ -n "${_UEFISYSDEV}" ]]; then elif [[ -n "${_DO_UEFISYSDEV}" ]]; then
_dialog --menu "Select the mountpoint of your Efi System Partition (ESP) on ${_DEV}:" 15 50 12 /boot _ /efi _ 2>"${_ANSWER}" || return 1 _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}") _MP=$(cat "${_ANSWER}")
else else
@ -174,14 +174,12 @@ _mountpoints() {
#shellcheck disable=SC2086 #shellcheck disable=SC2086
if [[ -n ${_DO_ROOT} ]]; then 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 /:" 15 50 12 ${_DEVS} 2>"${_ANSWER}" || return 1
_DEV_ROOT=$(cat "${_ANSWER}")
elif [[ -n ${_DO_UEFISYSDEV} ]]; then 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 _dialog --menu "Select the device to mount as Efi System Partition (ESP):" 15 50 12 ${_DEVS} 2>"${_ANSWER}" || return 1
_UEFISYSDEV=$(cat "${_ANSWER}")
else else
_dialog --menu "Select any additional devices to mount under your new root:" 15 52 12 ${_DEVS} DONE _ 2>"${_ANSWER}" || return 1 _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 fi
_DEV=$(cat "${_ANSWER}")
if [[ "${_DEV}" != "DONE" ]]; then if [[ "${_DEV}" != "DONE" ]]; then
_FSTYPE="$(${_LSBLK} FSTYPE "${_DEV}")" _FSTYPE="$(${_LSBLK} FSTYPE "${_DEV}")"
# clear values first! # clear values first!