mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
add SWAP and ROOT DEVICE
This commit is contained in:
parent
1b78ba0425
commit
6a90a57f5c
2 changed files with 5 additions and 4 deletions
|
@ -13,10 +13,11 @@ setup:
|
||||||
- added Unified Kernel Image suppport in EFISTUB menu
|
- added Unified Kernel Image suppport in EFISTUB menu
|
||||||
- new efibootmgr routine
|
- new efibootmgr routine
|
||||||
- new systemd compliant mounting dialogs with /efi or /boot as ESP
|
- 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
|
- Auto-Prepare mode is systemd-gpt-auto-generator compliant now
|
||||||
- disable unsafe menu entries on installed system
|
- 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
|
- added new menu title if running on installed system
|
||||||
- fixed automounted ESP and /boot detection on installed systems
|
- fixed automounted ESP and /boot detection on installed systems
|
||||||
- don't ask for network, sources and mkfs on installed sytems
|
- don't ask for network, sources and mkfs on installed sytems
|
||||||
|
|
|
@ -155,7 +155,7 @@ _mountpoints() {
|
||||||
# swap setting
|
# swap setting
|
||||||
#
|
#
|
||||||
#shellcheck disable=SC2086
|
#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}")
|
_DEV=$(cat "${_ANSWER}")
|
||||||
_FSTYPE="$(${_LSBLK} FSTYPE "${_DEV}")"
|
_FSTYPE="$(${_LSBLK} FSTYPE "${_DEV}")"
|
||||||
if [[ "${_DEV}" != "NONE" ]]; then
|
if [[ "${_DEV}" != "NONE" ]]; then
|
||||||
|
@ -181,7 +181,7 @@ _mountpoints() {
|
||||||
while [[ "${_DEV}" != "DONE" ]]; do
|
while [[ "${_DEV}" != "DONE" ]]; do
|
||||||
#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 ROOT DEVICE /:" 15 50 12 ${_DEVS} 2>"${_ANSWER}" || return 1
|
||||||
elif [[ -n "${_DO_UEFISYSDEV}" ]]; then
|
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
|
_dialog --menu "Select the device to mount as\nEFI SYSTEM PARTITION (ESP):" 15 40 12 ${_DEVS} 2>"${_ANSWER}" || return 1
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue