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

add SWAP and ROOT DEVICE

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-25 07:10:26 +01:00
parent 1b78ba0425
commit 6a90a57f5c
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG
View file

@ -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

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

@ -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