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

start adding SWAP file support

Browse source
This commit is contained in:
Tobias Powalowski 2024-06-05 19:15:24 +02:00
parent f50c3dd0bb
commit d7667114e5
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -62,11 +62,18 @@ _select_filesystem() {
_enter_mountpoint() { _enter_mountpoint() {
if [[ -z "${_SWAP_DONE}" ]]; then if [[ -z "${_SWAP_DONE}" ]]; then
if [[ "${_DEV}" == "> FILE" ]]; then if [[ "${_DEV}" == "> FILE" ]]; then
_SWAPFILE=""
_SWAPFILE_SIZE=""
while [[ -z "${_SWAPFILE}" ]]; do while [[ -z "${_SWAPFILE}" ]]; do
_dialog --no-cancel --title " Enter Full Path Filename For Swap " --inputbox "" 7 65 "/archlinux.swap" 2>"${_ANSWER}" || return 1 _dialog --no-cancel --title " Enter Full Path Filename For Swap " --inputbox "" 7 65 "/archlinux.swap" 2>"${_ANSWER}" || return 1
_SWAPFILE=$(cat "${_ANSWER}") _SWAPFILE=$(cat "${_ANSWER}")
done done
_DEV="${_SWAPFILE}" _DEV="${_SWAPFILE}"
while [[ -z "${_SWAPFILE_SIZE}" ]]; do
_dialog --no-cancel --title " Enter Size in MiB " --inputbox "16000" 7 65 "/archlinux.swap" 2>"${_ANSWER}" || return 1
_SWAPFILE_SIZE=$(cat "${_ANSWER}")
done
_FSOPTS="${_SWAPFILE_SIZE}"
fi fi
_MP="swap" _MP="swap"
_FSTYPE="swap" _FSTYPE="swap"
@ -433,7 +440,11 @@ _mkfs() {
if [[ "${2}" == "swap" ]]; then if [[ "${2}" == "swap" ]]; then
swapoff -a &>"${_NO_LOG}" swapoff -a &>"${_NO_LOG}"
if [[ -n "${4}" ]]; then if [[ -n "${4}" ]]; then
if _LSBLK NAME | grep -q "${1}"; then
mkswap -L "${6}" "${1}" &>"${_LOG}" mkswap -L "${6}" "${1}" &>"${_LOG}"
else
mkswap -U clear --size ${}M --file "${1}" &>"${_LOG}"
fi
sleep 2 sleep 2
#shellcheck disable=SC2181 #shellcheck disable=SC2181
if [[ $? != 0 ]]; then if [[ $? != 0 ]]; then